627 files changed, 117615 insertions, 117610 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties
index feffce05748..7d9a2cfe64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               icons/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
index 81e484a7839..3609eaf91ea 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.emf.nattable</artifactId>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf.nattable</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
index 1e9ba5fb6b4..3ada05b8a3b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.emf.nattable;

-

-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.infra.emf.nattable"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

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

-	}

-

-}

+/*****************************************************************************
+ * 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.emf.nattable;
+
+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.infra.emf.nattable"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	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/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
index b376a3843ca..16d9047871d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
@@ -1,294 +1,294 @@
-/*****************************************************************************

- * 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.emf.nattable.celleditor.config;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

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

-import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

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

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

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

-import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditorEx;

-import org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;

-

-/**

- * The configuration to edit EMF properties

- *

- * @author Vincent Lorenzo

- * @deprecated Used just until Papyrus Luna. Replaced by classes that are specific to each type of cell editor in the package org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration

- * 

- */

-@Deprecated

-public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfiguration {

-

-	/**

-	 * the id of the editor config

-	 */

-	public static final String EDITOR_CONFIG_ID = "EMF_EDITOR"; //$NON-NLS-1$

-

-	/**

-	 * the int used to identify the kind of editor

-	 */

-	public static final int UNKNOWN_TYPE = -1;

-

-	public static final int SINGLE_BOOLEAN = 1;

-

-	public static final int MULTI_BOOLEAN = SINGLE_BOOLEAN + 1;

-

-	public static final int SINGLE_STRING = MULTI_BOOLEAN + 1;

-

-	public static final int MULTI_STRING = SINGLE_STRING + 1;

-

-	public static final int SINGLE_INTEGER = MULTI_STRING + 1;

-

-	public static final int MULTI_INTEGER = SINGLE_INTEGER + 1;

-

-	public static final int SINGLE_EENUM_TYPE = MULTI_INTEGER + 1;

-

-	public static final int MULTI_EENUM_TYPE = SINGLE_EENUM_TYPE + 1;

-

-	public static final int SINGLE_EMF_REFERENCE = MULTI_EENUM_TYPE + 1;

-

-	public static final int MULTI_EMF_REFERENCE = SINGLE_EMF_REFERENCE + 1;

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getICellEditor(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 * @return

-	 */

-	@Override

-	public ICellEditor getICellEditor(Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		ICellEditor editor = null;

-		switch (editorKind) {

-		case SINGLE_STRING:

-			editor = new MultiLineTextCellEditorEx(true);

-			break;

-		case SINGLE_INTEGER:

-			editor = new TextCellEditor();

-			break;

-		case SINGLE_BOOLEAN:

-			editor = new CheckBoxCellEditor();

-			break;

-		case SINGLE_EENUM_TYPE:

-			editor = new ComboBoxCellEditor(new EEnumComboBoxDataProvider((EEnum) ((EStructuralFeature) axisElement).getEType()));

-			break;

-		default:

-			break;

-		}

-		return editor;

-	}

-

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorConfigId()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getEditorConfigId() {

-		return EDITOR_CONFIG_ID;

-	}

-

-	/**

-	 * Return the combo data provider. This method is not in the interface, because it can't be generalized to all editors. It is used only by

-	 * ComboBox

-	 *

-	 * @param table

-	 *            the edited table

-	 * @param axisElement

-	 *            the axis element

-	 * @param elementProvider

-	 *            the element provider

-	 * @return

-	 *         the combo data provider

-	 */

-	protected IComboBoxDataProvider getComboDataProvider(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param provider

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayConvert(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.jface.viewers.ILabelProvider)

-	 *

-	 * @return

-	 */

-	@Override

-	public IDisplayConverter getDisplayConvert(final Table table, final Object axisElement, final ILabelProvider provider) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		IDisplayConverter displayConverter = null;

-		switch (editorKind) {

-		case SINGLE_BOOLEAN:

-			displayConverter = new DefaultBooleanDisplayConverter();

-			break;

-		case SINGLE_INTEGER:

-			displayConverter = new DefaultIntegerDisplayConverter();

-			break;

-		case SINGLE_EENUM_TYPE:

-			displayConverter = new DisplayConverter() {

-

-				@Override

-				public Object displayToCanonicalValue(Object displayValue) {

-					return null;

-				}

-

-				@Override

-				public Object canonicalToDisplayValue(Object canonicalValue) {

-					return provider.getText(canonicalValue);

-				}

-			};

-			break;

-		default:

-			break;

-		}

-		return displayConverter;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getCellPainter(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public ICellPainter getCellPainter(Table table, Object axisElement) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		ICellPainter cellPainter = null;

-		switch (editorKind) {

-		case SINGLE_BOOLEAN:

-			cellPainter = new CustomCheckBoxPainter();

-			break;

-		case SINGLE_EENUM_TYPE:

-			cellPainter = new ComboBoxPainter();

-			break;

-		default:

-			cellPainter = new TextPainter();// TODO : seems overriden by the CustomizedCellPainter... -> the result is correct, but our code is maybe incorrect

-			break;

-		}

-		return cellPainter;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayMode(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public String getDisplayMode(Table table, Object axisElement) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		String displayMode = DisplayMode.EDIT;

-		switch (editorKind) {

-		case SINGLE_BOOLEAN:

-			displayMode = DisplayMode.NORMAL;

-			break;

-		default:

-			break;

-		}

-		return displayMode;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration#getDataValidator(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public IDataValidator getDataValidator(Table table, Object axisElement) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 *         <code>true</code> if axisElement is a {@link EStructuralFeature}

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		return axisElement instanceof EStructuralFeature;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the edited table

-	 * @param axisElement

-	 *            the edited feature

-	 * @return

-	 *         an integer which identify the type of the feature or {@value #UNKNOWN_TYPE} if we can't found it

-	 */

-	protected int getFeatureIdentifier(final Table table, final Object axisElement) {

-		int editorKind = UNKNOWN_TYPE;

-		assert axisElement instanceof EStructuralFeature;

-		final EStructuralFeature feature = (EStructuralFeature) axisElement;

-		final EClassifier eType = feature.getEType();

-		boolean isMany = feature.isMany();

-		if (eType instanceof EEnum) {

-			if (isMany) {

-				editorKind = MULTI_EENUM_TYPE;

-			} else {

-				editorKind = SINGLE_EENUM_TYPE;

-			}

-		} else if (eType instanceof EDataType) {

-

-		} else if (EMFHelper.isSuperType(EcorePackage.eINSTANCE.getEObject(), eType)) {

-			if (isMany) {

-				editorKind = MULTI_EMF_REFERENCE;

-			} else {

-				editorKind = SINGLE_EMF_REFERENCE;

-			}

-		}

-		return editorKind;

-	}

-}

+/*****************************************************************************
+ * 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.emf.nattable.celleditor.config;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+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.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditorEx;
+import org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;
+
+/**
+ * The configuration to edit EMF properties
+ *
+ * @author Vincent Lorenzo
+ * @deprecated Used just until Papyrus Luna. Replaced by classes that are specific to each type of cell editor in the package org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration
+ * 
+ */
+@Deprecated
+public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfiguration {
+
+	/**
+	 * the id of the editor config
+	 */
+	public static final String EDITOR_CONFIG_ID = "EMF_EDITOR"; //$NON-NLS-1$
+
+	/**
+	 * the int used to identify the kind of editor
+	 */
+	public static final int UNKNOWN_TYPE = -1;
+
+	public static final int SINGLE_BOOLEAN = 1;
+
+	public static final int MULTI_BOOLEAN = SINGLE_BOOLEAN + 1;
+
+	public static final int SINGLE_STRING = MULTI_BOOLEAN + 1;
+
+	public static final int MULTI_STRING = SINGLE_STRING + 1;
+
+	public static final int SINGLE_INTEGER = MULTI_STRING + 1;
+
+	public static final int MULTI_INTEGER = SINGLE_INTEGER + 1;
+
+	public static final int SINGLE_EENUM_TYPE = MULTI_INTEGER + 1;
+
+	public static final int MULTI_EENUM_TYPE = SINGLE_EENUM_TYPE + 1;
+
+	public static final int SINGLE_EMF_REFERENCE = MULTI_EENUM_TYPE + 1;
+
+	public static final int MULTI_EMF_REFERENCE = SINGLE_EMF_REFERENCE + 1;
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getICellEditor(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 * @return
+	 */
+	@Override
+	public ICellEditor getICellEditor(Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		ICellEditor editor = null;
+		switch (editorKind) {
+		case SINGLE_STRING:
+			editor = new MultiLineTextCellEditorEx(true);
+			break;
+		case SINGLE_INTEGER:
+			editor = new TextCellEditor();
+			break;
+		case SINGLE_BOOLEAN:
+			editor = new CheckBoxCellEditor();
+			break;
+		case SINGLE_EENUM_TYPE:
+			editor = new ComboBoxCellEditor(new EEnumComboBoxDataProvider((EEnum) ((EStructuralFeature) axisElement).getEType()));
+			break;
+		default:
+			break;
+		}
+		return editor;
+	}
+
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorConfigId()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getEditorConfigId() {
+		return EDITOR_CONFIG_ID;
+	}
+
+	/**
+	 * Return the combo data provider. This method is not in the interface, because it can't be generalized to all editors. It is used only by
+	 * ComboBox
+	 *
+	 * @param table
+	 *            the edited table
+	 * @param axisElement
+	 *            the axis element
+	 * @param elementProvider
+	 *            the element provider
+	 * @return
+	 *         the combo data provider
+	 */
+	protected IComboBoxDataProvider getComboDataProvider(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param provider
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayConvert(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.jface.viewers.ILabelProvider)
+	 *
+	 * @return
+	 */
+	@Override
+	public IDisplayConverter getDisplayConvert(final Table table, final Object axisElement, final ILabelProvider provider) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		IDisplayConverter displayConverter = null;
+		switch (editorKind) {
+		case SINGLE_BOOLEAN:
+			displayConverter = new DefaultBooleanDisplayConverter();
+			break;
+		case SINGLE_INTEGER:
+			displayConverter = new DefaultIntegerDisplayConverter();
+			break;
+		case SINGLE_EENUM_TYPE:
+			displayConverter = new DisplayConverter() {
+
+				@Override
+				public Object displayToCanonicalValue(Object displayValue) {
+					return null;
+				}
+
+				@Override
+				public Object canonicalToDisplayValue(Object canonicalValue) {
+					return provider.getText(canonicalValue);
+				}
+			};
+			break;
+		default:
+			break;
+		}
+		return displayConverter;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getCellPainter(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public ICellPainter getCellPainter(Table table, Object axisElement) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		ICellPainter cellPainter = null;
+		switch (editorKind) {
+		case SINGLE_BOOLEAN:
+			cellPainter = new CustomCheckBoxPainter();
+			break;
+		case SINGLE_EENUM_TYPE:
+			cellPainter = new ComboBoxPainter();
+			break;
+		default:
+			cellPainter = new TextPainter();// TODO : seems overriden by the CustomizedCellPainter... -> the result is correct, but our code is maybe incorrect
+			break;
+		}
+		return cellPainter;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayMode(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public String getDisplayMode(Table table, Object axisElement) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		String displayMode = DisplayMode.EDIT;
+		switch (editorKind) {
+		case SINGLE_BOOLEAN:
+			displayMode = DisplayMode.NORMAL;
+			break;
+		default:
+			break;
+		}
+		return displayMode;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration#getDataValidator(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public IDataValidator getDataValidator(Table table, Object axisElement) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 *         <code>true</code> if axisElement is a {@link EStructuralFeature}
+	 */
+	@Override
+	public boolean handles(Table table, Object axisElement) {
+		return axisElement instanceof EStructuralFeature;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the edited table
+	 * @param axisElement
+	 *            the edited feature
+	 * @return
+	 *         an integer which identify the type of the feature or {@value #UNKNOWN_TYPE} if we can't found it
+	 */
+	protected int getFeatureIdentifier(final Table table, final Object axisElement) {
+		int editorKind = UNKNOWN_TYPE;
+		assert axisElement instanceof EStructuralFeature;
+		final EStructuralFeature feature = (EStructuralFeature) axisElement;
+		final EClassifier eType = feature.getEType();
+		boolean isMany = feature.isMany();
+		if (eType instanceof EEnum) {
+			if (isMany) {
+				editorKind = MULTI_EENUM_TYPE;
+			} else {
+				editorKind = SINGLE_EENUM_TYPE;
+			}
+		} else if (eType instanceof EDataType) {
+
+		} else if (EMFHelper.isSuperType(EcorePackage.eINSTANCE.getEObject(), eType)) {
+			if (isMany) {
+				editorKind = MULTI_EMF_REFERENCE;
+			} else {
+				editorKind = SINGLE_EMF_REFERENCE;
+			}
+		}
+		return editorKind;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
index 7604f5b76bc..903732e4d00 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
@@ -1,120 +1,120 @@
-/*****************************************************************************

- * 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.celleditor.config;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;

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

-import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;

-import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;

-

-/**

- * @author MA244259

- *

- */

-public class SingleEEnumTypeCellEditorConfiguration implements ICellAxisConfiguration {

-

-	/**

-	 * the id of this editor

-	 */

-	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleEEnumTypeCellEditorConfiguration.ComboBox";//$NON-NLS-1$

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getConfigurationId() {

-		return ID;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getConfigurationDescription() {

-		return "This configuration provides a ComboBox editor for a single EEnum type"; //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 * 		<code>true</code> if axisElement is a {@link EEnum} {@link EStructuralFeature}

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		Object representedElement = AxisUtils.getRepresentedElement(axisElement);

-		if (representedElement instanceof EStructuralFeature) {

-			EStructuralFeature feature = (EStructuralFeature) representedElement;

-			if (!feature.isMany()) {

-				EClassifier eType = feature.getEType();

-				return eType instanceof EEnum;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.ICellAxisEditorConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)

-	 *

-	 * @param configRegistry

-	 * @param axis

-	 * @param configLabel

-	 */

-	@Override

-	public void configureCellEditor(final IConfigRegistry configRegistry, Object axis, String configLabel) {

-		Object representedElement = AxisUtils.getRepresentedElement(axis);

-		EEnum eenum = (EEnum) ((EStructuralFeature) representedElement).getEType();

-

-		IDisplayConverter displayConverter = new DisplayConverter() {

-

-			@Override

-			public Object displayToCanonicalValue(Object displayValue) {

-				return null;

-			}

-

-			@Override

-			public Object canonicalToDisplayValue(Object canonicalValue) {

-				// for others case

-				// LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-				// return service.getLabelProvider(canonicalValue).getText(canonicalValue);

-				//

-

-				return new EMFLabelProvider().getText(canonicalValue);

-			}

-		};

-

-		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new ComboBoxPainter(), DisplayMode.NORMAL, configLabel);

-		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new ComboBoxCellEditor(new EEnumComboBoxDataProvider(eenum)), DisplayMode.EDIT, configLabel);

-		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, displayConverter, DisplayMode.EDIT, configLabel);

-	}

-}

+/*****************************************************************************
+ * 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.celleditor.config;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;
+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
+
+/**
+ * @author MA244259
+ *
+ */
+public class SingleEEnumTypeCellEditorConfiguration implements ICellAxisConfiguration {
+
+	/**
+	 * the id of this editor
+	 */
+	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleEEnumTypeCellEditorConfiguration.ComboBox";//$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getConfigurationId() {
+		return ID;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getConfigurationDescription() {
+		return "This configuration provides a ComboBox editor for a single EEnum type"; //$NON-NLS-1$
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 * 		<code>true</code> if axisElement is a {@link EEnum} {@link EStructuralFeature}
+	 */
+	@Override
+	public boolean handles(Table table, Object axisElement) {
+		Object representedElement = AxisUtils.getRepresentedElement(axisElement);
+		if (representedElement instanceof EStructuralFeature) {
+			EStructuralFeature feature = (EStructuralFeature) representedElement;
+			if (!feature.isMany()) {
+				EClassifier eType = feature.getEType();
+				return eType instanceof EEnum;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.ICellAxisEditorConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+	 *
+	 * @param configRegistry
+	 * @param axis
+	 * @param configLabel
+	 */
+	@Override
+	public void configureCellEditor(final IConfigRegistry configRegistry, Object axis, String configLabel) {
+		Object representedElement = AxisUtils.getRepresentedElement(axis);
+		EEnum eenum = (EEnum) ((EStructuralFeature) representedElement).getEType();
+
+		IDisplayConverter displayConverter = new DisplayConverter() {
+
+			@Override
+			public Object displayToCanonicalValue(Object displayValue) {
+				return null;
+			}
+
+			@Override
+			public Object canonicalToDisplayValue(Object canonicalValue) {
+				// for others case
+				// LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+				// return service.getLabelProvider(canonicalValue).getText(canonicalValue);
+				//
+
+				return new EMFLabelProvider().getText(canonicalValue);
+			}
+		};
+
+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new ComboBoxPainter(), DisplayMode.NORMAL, configLabel);
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new ComboBoxCellEditor(new EEnumComboBoxDataProvider(eenum)), DisplayMode.EDIT, configLabel);
+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, displayConverter, DisplayMode.EDIT, configLabel);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
index 9063d135055..d49a98ae701 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * 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.emf.nattable.dataprovider;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class EEnumComboBoxDataProvider implements IComboBoxDataProvider {

-

-	/**

-	 * the enumeration for which we want the literals

-	 */

-	private final EEnum eenum;

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 * @param eenum

-	 *            the enumeration for which we want the literals

-	 */

-	public EEnumComboBoxDataProvider(EEnum eenum) {

-		this.eenum = eenum;

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public EEnumComboBoxDataProvider(Object axisElement) {

-		Object object = AxisUtils.getRepresentedElement(axisElement);

-		Assert.isTrue(object instanceof EStructuralFeature);

-		EStructuralFeature feature = (EStructuralFeature) object;

-		EClassifier type = feature.getEType();

-		Assert.isTrue(type instanceof EEnum);

-		this.eenum = (EEnum) type;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public List<?> getValues(int columnIndex, int rowIndex) {

-		final List<Object> literals = new ArrayList<Object>();

-		for (final EEnumLiteral instances : this.eenum.getELiterals()) {

-			literals.add(instances.getInstance());

-		}

-		return literals;

-	}

-}

+/*****************************************************************************
+ * 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.emf.nattable.dataprovider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class EEnumComboBoxDataProvider implements IComboBoxDataProvider {
+
+	/**
+	 * the enumeration for which we want the literals
+	 */
+	private final EEnum eenum;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param eenum
+	 *            the enumeration for which we want the literals
+	 */
+	public EEnumComboBoxDataProvider(EEnum eenum) {
+		this.eenum = eenum;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public EEnumComboBoxDataProvider(Object axisElement) {
+		Object object = AxisUtils.getRepresentedElement(axisElement);
+		Assert.isTrue(object instanceof EStructuralFeature);
+		EStructuralFeature feature = (EStructuralFeature) object;
+		EClassifier type = feature.getEType();
+		Assert.isTrue(type instanceof EEnum);
+		this.eenum = (EEnum) type;
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public List<?> getValues(int columnIndex, int rowIndex) {
+		final List<Object> literals = new ArrayList<Object>();
+		for (final EEnumLiteral instances : this.eenum.getELiterals()) {
+			literals.add(instances.getInstance());
+		}
+		return literals;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
index 585b42423e1..b729cb82bcd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * 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.emf.nattable.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.emf.nattable.messages.messages"; //$NON-NLS-1$

-

-	public static String EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId;

-

-	public static String EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * 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.emf.nattable.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.emf.nattable.messages.messages"; //$NON-NLS-1$
+
+	public static String EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId;
+
+	public static String EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
index ae225fa44d5..7e06d480538 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
@@ -1,2 +1,2 @@
-EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId=Several Cell Editor configuration are declared with the same id {0}

-EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId=The cell editor configuration {0} provides a null cellId

+EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId=Several Cell Editor configuration are declared with the same id {0}
+EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId=The cell editor configuration {0} provides a null cellId
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
index 5c0b4d38ef7..45c47ee816d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
@@ -1,102 +1,102 @@
-/*****************************************************************************

- * 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.emf.nattable.registry;

-

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Image registry to use for EStructuralFeature

- */

-public class EStructuralFeatureImageRegistry {

-

-	/** paths for emf feature icons */

-	private static final String LINK_ICON_PATH = "/icons/link.gif"; //$NON-NLS-1$

-

-	private static final String LINK_UNIDIR_ICON_PATH = "/icons/link_unidir.gif"; //$NON-NLS-1$

-

-	private static final String AGGREG_ICON_PATH = "/icons/aggreg.gif"; //$NON-NLS-1$

-

-	private static final String AGGREG_UNIDIR_ICON_PATH = "/icons/aggreg_unidir.gif"; //$NON-NLS-1$

-

-	private static final String INV_AGGREG_ICON_PATH = "/icons/inv_aggreg.gif"; //$NON-NLS-1$

-

-	private static final String ATTRIBUTE_ICON_PATH = "/icons/attributes.gif"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * @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);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for link

-	 */

-	public static Image getLinkIcon() {

-		return EStructuralFeatureImageRegistry.getImage(LINK_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for unidirectional link

-	 */

-	public static Image getUnidirectionalLinkIcon() {

-		return EStructuralFeatureImageRegistry.getImage(LINK_UNIDIR_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for aggregation

-	 */

-	public static Image getInvAggregIcon() {

-		return EStructuralFeatureImageRegistry.getImage(INV_AGGREG_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for aggregation

-	 */

-	public static Image getAggregIcon() {

-		return EStructuralFeatureImageRegistry.getImage(AGGREG_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for unidirectional aggregation

-	 */

-	public static Image getUnidirectionalAggregIcon() {

-		return EStructuralFeatureImageRegistry.getImage(AGGREG_UNIDIR_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the attribute icon

-	 */

-	public static Image getAttributeIcon() {

-		return EStructuralFeatureImageRegistry.getImage(ATTRIBUTE_ICON_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.emf.nattable.registry;
+
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Image registry to use for EStructuralFeature
+ */
+public class EStructuralFeatureImageRegistry {
+
+	/** paths for emf feature icons */
+	private static final String LINK_ICON_PATH = "/icons/link.gif"; //$NON-NLS-1$
+
+	private static final String LINK_UNIDIR_ICON_PATH = "/icons/link_unidir.gif"; //$NON-NLS-1$
+
+	private static final String AGGREG_ICON_PATH = "/icons/aggreg.gif"; //$NON-NLS-1$
+
+	private static final String AGGREG_UNIDIR_ICON_PATH = "/icons/aggreg_unidir.gif"; //$NON-NLS-1$
+
+	private static final String INV_AGGREG_ICON_PATH = "/icons/inv_aggreg.gif"; //$NON-NLS-1$
+
+	private static final String ATTRIBUTE_ICON_PATH = "/icons/attributes.gif"; //$NON-NLS-1$
+
+
+	/**
+	 *
+	 * @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);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for link
+	 */
+	public static Image getLinkIcon() {
+		return EStructuralFeatureImageRegistry.getImage(LINK_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for unidirectional link
+	 */
+	public static Image getUnidirectionalLinkIcon() {
+		return EStructuralFeatureImageRegistry.getImage(LINK_UNIDIR_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for aggregation
+	 */
+	public static Image getInvAggregIcon() {
+		return EStructuralFeatureImageRegistry.getImage(INV_AGGREG_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for aggregation
+	 */
+	public static Image getAggregIcon() {
+		return EStructuralFeatureImageRegistry.getImage(AGGREG_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for unidirectional aggregation
+	 */
+	public static Image getUnidirectionalAggregIcon() {
+		return EStructuralFeatureImageRegistry.getImage(AGGREG_UNIDIR_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the attribute icon
+	 */
+	public static Image getAttributeIcon() {
+		return EStructuralFeatureImageRegistry.getImage(ATTRIBUTE_ICON_PATH);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
index 7657992918a..9ae74a6ca6f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * 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.emf.nattable.selection;

-

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class EObjectSelectionExtractor extends ObjectsSelectionExtractor {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor#getRealObject(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	protected Object getRealObject(Object object) {

-		return EMFHelper.getEObject(object);

-	}

-}

+/*****************************************************************************
+ * 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.emf.nattable.selection;
+
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class EObjectSelectionExtractor extends ObjectsSelectionExtractor {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor#getRealObject(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	protected Object getRealObject(Object object) {
+		return EMFHelper.getEObject(object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
index 2ec559ad55b..03e430c8100 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * 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.emf.nattable.validator;

-

-import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;

-

-/**

- *

- * The Validator for Integer

- *

- */

-public class IntegerDataValidator extends DataValidator {

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 * @return

-	 */

-	@Override

-	public boolean validate(int columnIndex, int rowIndex, Object newValue) {

-		try {

-			if (newValue != null) {

-				new Integer(newValue.toString());

-			}

-		} catch (Exception e) {

-			return false;

-		}

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * 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.emf.nattable.validator;
+
+import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;
+
+/**
+ *
+ * The Validator for Integer
+ *
+ */
+public class IntegerDataValidator extends DataValidator {
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 * @return
+	 */
+	@Override
+	public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+		try {
+			if (newValue != null) {
+				new Integer(newValue.toString());
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
index 3b879220b4e..a2203a973c5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.common

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.common
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Nattable Editor Common
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties
index 9f6f241251f..117e09a9138 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties
@@ -1,11 +1,11 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html,\

-               icons/,\

-               model/

-src.includes = about.html,\

-               model/

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/,\
+               about.html,\
+               icons/,\
+               model/
+src.includes = about.html,\
+               model/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
index ea7e8e002a2..241bd509554 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" name="NattableCommon" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" name="NattableCommon" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
index b2d306df55a..ffd820d91ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>

-	<version>4.100.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>
+	<version>4.100.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
index 46b49173992..54de55b5b2b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.common;

-

-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.infra.nattable.common"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

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

-	}

-

-}

+/*****************************************************************************
+ * 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.common;
+
+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.infra.nattable.common"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	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/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java
index 40f5c059e12..953eb1ba594 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

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

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.adapter;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenableWithContainer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-@SuppressWarnings("rawtypes")

-public class NattableAdapterFactory implements IAdapterFactory {

-

-	@Override

-	public Object getAdapter(Object adaptableObject, Class adapterType) {

-		if (adapterType == IOpenable.class) {

-			if (adaptableObject instanceof Table) {

-				Table table = (Table) adaptableObject;

-				return new IOpenableWithContainer.Openable(adaptableObject, table.getContext());

-			}

-		}

-		return null;

-	}

-

-	@Override

-	public Class[] getAdapterList() {

-		return new Class[] { IOpenable.class };

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.adapter;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenableWithContainer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+@SuppressWarnings("rawtypes")
+public class NattableAdapterFactory implements IAdapterFactory {
+
+	@Override
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (adapterType == IOpenable.class) {
+			if (adaptableObject instanceof Table) {
+				Table table = (Table) adaptableObject;
+				return new IOpenableWithContainer.Openable(adaptableObject, table.getContext());
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Class[] getAdapterList() {
+		return new Class[] { IOpenable.class };
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
index 86bd95c36cf..06a0735362f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.common.editor;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * The Editor used for Papyrus NatTable model

- *

- * @author Vincent Lorenzo

- *

- */

-public class NatTableEditor extends AbstractEMFNattableEditor {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param servicesRegistry

-	 * @param rawModel

-	 */

-	public NatTableEditor(ServicesRegistry servicesRegistry, Table rawModel) {

-		super(servicesRegistry, rawModel);

-	}

-

-}

+/*****************************************************************************
+ * 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.common.editor;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * The Editor used for Papyrus NatTable model
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class NatTableEditor extends AbstractEMFNattableEditor {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param servicesRegistry
+	 * @param rawModel
+	 */
+	public NatTableEditor(ServicesRegistry servicesRegistry, Table rawModel) {
+		super(servicesRegistry, rawModel);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
index 12f7306de34..62cff86463c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * 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.common.editor;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

-

-public abstract class SynchronizedTableEditor extends AbstractEMFNattableEditor implements IRevealSemanticElement {

-

-	public SynchronizedTableEditor(final ServicesRegistry servicesRegistry, final Table rawModel) {

-		super(servicesRegistry, rawModel);

-	}

-

-}

+/*****************************************************************************
+ * 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.common.editor;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
+
+public abstract class SynchronizedTableEditor extends AbstractEMFNattableEditor implements IRevealSemanticElement {
+
+	public SynchronizedTableEditor(final ServicesRegistry servicesRegistry, final Table rawModel) {
+		super(servicesRegistry, rawModel);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
index f6fb244db5b..2d43eed4073 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
@@ -1,201 +1,201 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, 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:

- *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr

- *  Christian W. Damus (CEA) - bug 392301

- *  Christian W. Damus - bug 474467

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.factory;

-

-import java.lang.reflect.Constructor;

-

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

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;

-import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * Abstract factory for the NattableEditor

- *

- *

- *

- */

-public class NattableEditorFactory extends AbstractEditorFactory {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editorClass

-	 *            the editor class

-	 * @param editorType

-	 *            the type of editor

-	 */

-	public NattableEditorFactory() {

-		super(NatTableEditor.class, "");// we don't use the type for the Nattable models

-	}

-

-	/**

-	 * Create the IPageModel that is used by the SashWindows to manage the editor.

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 *            The model pushed in the sashmodel by the creation command

-	 * @return A model implementing the IPageModel

-	 */

-	@Override

-	public IPageModel createIPageModel(Object pageIdentifier) {

-		ServicesRegistry services = getServiceRegistry();

-		ILabelProvider labels = ServiceUtils.getInstance().tryService(services, LabelProviderService.class)

-				.map(lps -> lps.getLabelProvider(pageIdentifier))

-				.orElseGet(TableLabelProvider::new);

-

-		return new NattableEditorModel(pageIdentifier, services, labels);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	@Override

-	public boolean isPageModelFactoryFor(Object pageIdentifier) {

-		return pageIdentifier instanceof Table;

-	}

-

-	/**

-	 * IEditorModel used internally by the SashContainer. This model know how to handle IEditor creation.

-	 *

-	 * @author cedric dumoulin

-	 *

-	 */

-	class NattableEditorModel extends AbstractPageModel implements IEditorModel {

-

-

-		/**

-		 * The servicesRegistry provided at creation.

-		 */

-		private ServicesRegistry servicesRegistry;

-

-		/**

-		 * The created editor.

-		 */

-		private IEditorPart editor;

-

-		/**

-		 * The raw model stored in the SashProvider.

-		 */

-		private Table rawModel;

-

-		/**

-		 *

-		 * Constructor.

-		 */

-		public NattableEditorModel(Object pageIdentifier, ServicesRegistry servicesRegistry, ILabelProvider labels) {

-			super(labels);

-

-			this.rawModel = (Table) pageIdentifier;

-			this.servicesRegistry = servicesRegistry;

-		}

-

-		/**

-		 * Create the IEditor for the diagram.

-		 *

-		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()

-		 * @return

-		 * @throws PartInitException

-		 *

-		 */

-		@Override

-		public IEditorPart createIEditorPart() throws PartInitException {

-			try {

-

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

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

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

-				this.editor = newEditor;

-				return this.editor;

-

-			} catch (Exception e) {

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

-				// programmer.

-				throw new PartInitException("Can't create Nattable", e); //$NON-NLS-1$

-			}

-

-		}

-

-		/**

-		 * Get the action bar requested by the Editor.

-		 *

-		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()

-		 * @return

-		 *

-		 */

-		@Override

-		public EditorActionBarContributor getActionBarContributor() {

-

-			String actionBarId = NattableEditorFactory.this.editorDescriptor.getActionBarContributorId();

-

-			// Do nothing if no EditorActionBarContributor is specify.

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

-				return null;

-			}

-

-			// Try to get it.

-

-			// Get ServiceRegistry

-			// ServicesRegistry serviceRegistry = getServicesRegistry();

-			ActionBarContributorRegistry registry;

-			try {

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

-			} catch (ServiceException e) {

-				// Service not found

-				Activator.log.error(e);

-				return null;

-			}

-

-			try {

-				return registry.getActionBarContributor(actionBarId);

-			} catch (BackboneException e) {

-				Activator.log.error(e);

-				return null;

-			}

-		}

-

-		/**

-		 * Get the underlying RawModel. Return the Diagram.

-		 *

-		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()

-		 * @return

-		 *

-		 */

-		@Override

-		public Object getRawModel() {

-			return this.rawModel;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, 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:
+ *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
+ *  Christian W. Damus (CEA) - bug 392301
+ *  Christian W. Damus - bug 474467
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.factory;
+
+import java.lang.reflect.Constructor;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;
+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * Abstract factory for the NattableEditor
+ *
+ *
+ *
+ */
+public class NattableEditorFactory extends AbstractEditorFactory {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editorClass
+	 *            the editor class
+	 * @param editorType
+	 *            the type of editor
+	 */
+	public NattableEditorFactory() {
+		super(NatTableEditor.class, "");// we don't use the type for the Nattable models
+	}
+
+	/**
+	 * Create the IPageModel that is used by the SashWindows to manage the editor.
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 *            The model pushed in the sashmodel by the creation command
+	 * @return A model implementing the IPageModel
+	 */
+	@Override
+	public IPageModel createIPageModel(Object pageIdentifier) {
+		ServicesRegistry services = getServiceRegistry();
+		ILabelProvider labels = ServiceUtils.getInstance().tryService(services, LabelProviderService.class)
+				.map(lps -> lps.getLabelProvider(pageIdentifier))
+				.orElseGet(TableLabelProvider::new);
+
+		return new NattableEditorModel(pageIdentifier, services, labels);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	@Override
+	public boolean isPageModelFactoryFor(Object pageIdentifier) {
+		return pageIdentifier instanceof Table;
+	}
+
+	/**
+	 * IEditorModel used internally by the SashContainer. This model know how to handle IEditor creation.
+	 *
+	 * @author cedric dumoulin
+	 *
+	 */
+	class NattableEditorModel extends AbstractPageModel implements IEditorModel {
+
+
+		/**
+		 * The servicesRegistry provided at creation.
+		 */
+		private ServicesRegistry servicesRegistry;
+
+		/**
+		 * The created editor.
+		 */
+		private IEditorPart editor;
+
+		/**
+		 * The raw model stored in the SashProvider.
+		 */
+		private Table rawModel;
+
+		/**
+		 *
+		 * Constructor.
+		 */
+		public NattableEditorModel(Object pageIdentifier, ServicesRegistry servicesRegistry, ILabelProvider labels) {
+			super(labels);
+
+			this.rawModel = (Table) pageIdentifier;
+			this.servicesRegistry = servicesRegistry;
+		}
+
+		/**
+		 * Create the IEditor for the diagram.
+		 *
+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()
+		 * @return
+		 * @throws PartInitException
+		 *
+		 */
+		@Override
+		public IEditorPart createIEditorPart() throws PartInitException {
+			try {
+
+				Constructor<?> c = getDiagramClass().getConstructor(ServicesRegistry.class, Table.class);
+				IEditorPart newEditor = (IEditorPart) c.newInstance(this.servicesRegistry, this.rawModel);
+				// IEditorPart newEditor = new DefaultNattableEditor(getServiceRegistry(), rawModel);
+				this.editor = newEditor;
+				return this.editor;
+
+			} catch (Exception e) {
+				// Lets propagate. This is an implementation problem that should be solved by
+				// programmer.
+				throw new PartInitException("Can't create Nattable", e); //$NON-NLS-1$
+			}
+
+		}
+
+		/**
+		 * Get the action bar requested by the Editor.
+		 *
+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
+		 * @return
+		 *
+		 */
+		@Override
+		public EditorActionBarContributor getActionBarContributor() {
+
+			String actionBarId = NattableEditorFactory.this.editorDescriptor.getActionBarContributorId();
+
+			// Do nothing if no EditorActionBarContributor is specify.
+			if (actionBarId == null || actionBarId.length() == 0) {
+				return null;
+			}
+
+			// Try to get it.
+
+			// Get ServiceRegistry
+			// ServicesRegistry serviceRegistry = getServicesRegistry();
+			ActionBarContributorRegistry registry;
+			try {
+				registry = this.servicesRegistry.getService(ActionBarContributorRegistry.class);
+			} catch (ServiceException e) {
+				// Service not found
+				Activator.log.error(e);
+				return null;
+			}
+
+			try {
+				return registry.getActionBarContributor(actionBarId);
+			} catch (BackboneException e) {
+				Activator.log.error(e);
+				return null;
+			}
+		}
+
+		/**
+		 * Get the underlying RawModel. Return the Diagram.
+		 *
+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()
+		 * @return
+		 *
+		 */
+		@Override
+		public Object getRawModel() {
+			return this.rawModel;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java
index cb9776a280c..a068742fb11 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java
@@ -1,386 +1,386 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:

- *  Vincent Lorenzo CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

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

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

-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;

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

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.commands.IPapyrusDuplicateCommandConstants;

-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.nattable.common.Activator;

-import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-

-/**

- * Edit Helper advice to add Table duplication when duplicating

- *

- * Duplicated and Adapted code from GMFDiagramDuplicatedEditHelperAdvice

- */

-public class NatTableDuplicateEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeDuplicateCommand(DuplicateElementsRequest request) {

-		Object additional = request.getParameter(IPapyrusDuplicateCommandConstants.ADDITIONAL_DUPLICATED_ELEMENTS);

-		// additional element should be a set of elements that will be duplicated. If this is null, the request will be ignored.

-		if (!(additional instanceof Set<?>)) {

-			return super.getBeforeDuplicateCommand(request);

-		}

-

-		Set<Object> duplicatedObjects = ((Set<Object>) additional);

-		EObject object = getDuplicatedEObject(request);

-		if (object == null || object.eResource() == null) {

-			return super.getBeforeDuplicateCommand(request);

-		}

-

-		// retrieve the Tables linked to the object

-		List<Table> tablesToDuplicate = new ArrayList<Table>();

-

-		ResourceSet resourceSet = object.eResource().getResourceSet();

-		ECrossReferenceAdapter adapter = ECrossReferenceAdapter.getCrossReferenceAdapter(resourceSet);

-		if (adapter == null) {

-			adapter = new ECrossReferenceAdapter();

-			resourceSet.eAdapters().add(adapter);

-		}

-

-		// do not proceed for graphical elements, which will have evident relationships to Diagrams (owner, etc.)

-		// not required for Table

-		// if(object instanceof View) {

-		// return super.getBeforeDuplicateCommand(request);

-		// }

-

-		// check for the element itself

-		Collection<Setting> settings = adapter.getInverseReferences(object, false);

-		for (Setting setting : settings) {

-			EObject value = setting.getEObject();

-			if (value instanceof Table) {

-				tablesToDuplicate.add((Table) value);

-			}

-		}

-

-		// check for sub-elements

-		for (Iterator<EObject> it = object.eAllContents(); it.hasNext();) {

-			EObject child = it.next();

-			settings = adapter.getInverseReferences(child, false);

-

-			for (Setting setting : settings) {

-				EObject value = setting.getEObject();

-				if (value instanceof Table) {

-					tablesToDuplicate.add((Table) value);

-				}

-			}

-		}

-

-

-		if (!tablesToDuplicate.isEmpty()) {

-			CompositeCommand command = null;

-			// create the command for all the Tables that have no command ready

-			for (Table TableToDuplicate : tablesToDuplicate) {

-				if (!duplicatedObjects.contains(TableToDuplicate)) {

-					if (command == null) {

-						command = new CompositeCommand("", Arrays.asList(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap()))); //$NON-NLS-1$ //$NON-NLS-2$

-					} else {

-						command.add(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap())); //$NON-NLS-1$

-					}

-					duplicatedObjects.add(TableToDuplicate);

-				}

-			}

-

-			if (command != null) {

-				if (super.getBeforeDuplicateCommand(request) != null) {

-					command.add(super.getBeforeDuplicateCommand(request));

-					return command.reduce();

-				} else {

-					return command.reduce();

-

-				}

-			}

-		}

-

-		return super.getBeforeDuplicateCommand(request);

-	}

-

-	/**

-	 * Returns the EObject to be duplicated

-	 *

-	 * @return the EObject to be duplicated

-	 */

-	protected EObject getDuplicatedEObject(DuplicateElementsRequest request) {

-		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();

-		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {

-			return null;

-		}

-		Object elementToBeDuplicated = elementsToBeDuplicated.get(0);

-		if (elementToBeDuplicated instanceof EObject) {

-			return ((EObject) elementToBeDuplicated);

-		}

-		return null;

-	}

-

-	/**

-	 * Command to duplicate Tables. This adds the Table to the resource containing the source Table.

-	 */

-	public class DuplicateTableCommand extends DuplicateEObjectsCommand {

-

-		/** Table to be duplicated */

-		private final Table TableToDuplicate;

-

-		/**

-		 * Constructs a new duplicate EObjects command with the specified label and

-		 * list of EObjects.

-		 *

-		 * @param editingDomain

-		 *            the editing domain through which model changes are made

-		 * @param label

-		 *            The label for the new command.

-		 * @param Table

-		 *            <code>Table</code> to be duplicated.

-		 */

-		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table) {

-			super(editingDomain, label, Collections.singletonList(Table));

-			this.TableToDuplicate = Table;

-		}

-

-		/**

-		 * Constructs a new duplicate EObjects command with the specified label and

-		 * list of EObjects.

-		 *

-		 * @param editingDomain

-		 *            the editing domain through which model changes are made

-		 * @param label

-		 *            The label for the new command.

-		 * @param Table

-		 *            <code>Table</code> to be duplicated.

-		 * @param allDuplicatedObjectsMap

-		 *            An empty map to be populated with the duplicated objects.

-		 */

-		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap) {

-			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap);

-			this.TableToDuplicate = Table;

-		}

-

-		/**

-		 * Constructs a new duplicate EObjects command with the specified label and

-		 * list of EObjects. Also sets the list of affected files to be the files,

-		 * where the targetContainer is stored. Target container specifies the

-		 * eObject into which the duplicated eObjects will be added.

-		 *

-		 * @param editingDomain

-		 *            the editing domain through which model changes are made

-		 * @param label

-		 *            The label for the new command.

-		 * @param Table

-		 *            <code>Table</code> to be duplicated.

-		 * @param allDuplicatedObjectsMap

-		 *            An empty map to be populated with the duplicated objects.

-		 */

-		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap, EObject targetContainer) {

-			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap, targetContainer);

-			this.TableToDuplicate = Table;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			// Remove elements whose container is getting copied.

-			// ClipboardSupportUtil.getCopyElements(getObjectsToBeDuplicated());

-

-			// Perform the copy and update the references.

-			EcoreUtil.Copier copier = new TableCopier(getAllDuplicatedObjectsMap());

-			copier.copy(TableToDuplicate);

-			copier.copyReferences();

-

-			EObject duplicateTable = copier.get(TableToDuplicate);

-			Resource targetResource = getNotationResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());

-			Resource diTargetResource = getDiResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());

-

-			if (targetResource != null) {

-				targetResource.getContents().add(duplicateTable);

-

-				if (diTargetResource != null) {

-					try {

-						IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);

-						pageManager.addPage(duplicateTable);

-					} catch (ServiceException e) {

-						Activator.log.error(e);

-					}

-				} else {

-					Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$

-				}

-			} else {

-				Activator.log.warn("It was not possible to find the Resource with the target EObject"); //$NON-NLS-1$

-				targetResource = TableToDuplicate.eResource();

-				if (targetResource != null) {

-					Activator.log.error("It was not possible to find the Resource with the source Table", null); //$NON-NLS-1$

-					targetResource.getContents().add(duplicateTable);

-					if (diTargetResource != null) {

-						try {

-							IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);

-							pageManager.addPage(duplicateTable);

-						} catch (ServiceException e) {

-							Activator.log.error(e);

-						}

-					} else {

-						Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$

-					}

-				}

-			}

-			return CommandResult.newOKCommandResult(getAllDuplicatedObjectsMap());

-		}

-

-		@Override

-		public boolean canExecute() {

-			// should add some tests here? no need to test containement feature like previous, Table has no owner...

-			return true;

-		}

-	}

-

-	/**

-	 * Returns the notation resource where to add the new Table

-	 *

-	 * @param eObject

-	 *            the semantic object linked to the Table or the Table itself.

-	 * @param domain

-	 *            the editing domain

-	 * @return the resource where the Table should be added or <code>null</code> if no resource was found

-	 *         TODO this method should be handled by the resource plugin.

-	 */

-	public Resource getNotationResourceForTable(EObject eObject, TransactionalEditingDomain domain) {

-		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);

-		EObject semanticObject;

-		if (!(object instanceof EObject)) {

-			semanticObject = eObject;

-		} else {

-			semanticObject = (EObject) object;

-		}

-

-		Resource containerResource = semanticObject.eResource();

-		if (containerResource == null) {

-			return null;

-		}

-		// retrieve the model set from the container resource

-		ResourceSet resourceSet = containerResource.getResourceSet();

-

-		if (resourceSet instanceof ModelSet) {

-			ModelSet modelSet = (ModelSet) resourceSet;

-			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION, true);

-			return destinationResource;

-		} else {

-			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$

-		}

-	}

-

-

-	/**

-	 * Returns the di resource where to add the new Table

-	 *

-	 * @param eObject

-	 *            the semantic object linked to the Table or the Table itself.

-	 * @param domain

-	 *            the editing domain

-	 * @return the resource where the Table should be added or <code>null</code> if no resource was found

-	 */

-	public Resource getDiResourceForTable(EObject eObject, TransactionalEditingDomain domain) {

-		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);

-		EObject semanticObject;

-		if (!(object instanceof EObject)) {

-			semanticObject = eObject;

-		} else {

-			semanticObject = (EObject) object;

-		}

-

-		Resource containerResource = semanticObject.eResource();

-		if (containerResource == null) {

-			return null;

-		}

-		// retrieve the model set from the container resource

-		ResourceSet resourceSet = containerResource.getResourceSet();

-

-		if (resourceSet instanceof ModelSet) {

-			ModelSet modelSet = (ModelSet) resourceSet;

-			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, DiModel.DI_FILE_EXTENSION, true);

-			return destinationResource;

-		} else {

-			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * Copier for Tables, where only views and internal references are duplicated, not the semantic elements themselves.

-	 */

-	protected class TableCopier extends EcoreUtil.Copier {

-

-		/** Serial UUID */

-		private static final long serialVersionUID = -1115934398631109073L;

-

-		/** semantic objects referenced by the views in the Table */

-		private Map<EObject, EObject> semanticObjects;

-

-		/**

-		 * Creates a new {@link TableCopier}

-		 *

-		 * @param semanticObjects

-		 *            list of semantic objects already copied, to which new views should be related.

-		 */

-		public TableCopier(Map<EObject, EObject> semanticObjects) {

-			this.semanticObjects = semanticObjects;

-		}

-

-		/**

-		 * Overrides the get to look in the map of duplicated semantic objects in case the element was not found in this map

-		 *

-		 * {@inheritDoc}

-		 */

-		@Override

-		public EObject get(Object arg0) {

-			EObject object = super.get(arg0);

-			if (object == null) {

-				object = semanticObjects.get(arg0);

-			}

-			return object;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:
+ *  Vincent Lorenzo CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.helper.advice;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.commands.IPapyrusDuplicateCommandConstants;
+import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.nattable.common.Activator;
+import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+
+/**
+ * Edit Helper advice to add Table duplication when duplicating
+ *
+ * Duplicated and Adapted code from GMFDiagramDuplicatedEditHelperAdvice
+ */
+public class NatTableDuplicateEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeDuplicateCommand(DuplicateElementsRequest request) {
+		Object additional = request.getParameter(IPapyrusDuplicateCommandConstants.ADDITIONAL_DUPLICATED_ELEMENTS);
+		// additional element should be a set of elements that will be duplicated. If this is null, the request will be ignored.
+		if (!(additional instanceof Set<?>)) {
+			return super.getBeforeDuplicateCommand(request);
+		}
+
+		Set<Object> duplicatedObjects = ((Set<Object>) additional);
+		EObject object = getDuplicatedEObject(request);
+		if (object == null || object.eResource() == null) {
+			return super.getBeforeDuplicateCommand(request);
+		}
+
+		// retrieve the Tables linked to the object
+		List<Table> tablesToDuplicate = new ArrayList<Table>();
+
+		ResourceSet resourceSet = object.eResource().getResourceSet();
+		ECrossReferenceAdapter adapter = ECrossReferenceAdapter.getCrossReferenceAdapter(resourceSet);
+		if (adapter == null) {
+			adapter = new ECrossReferenceAdapter();
+			resourceSet.eAdapters().add(adapter);
+		}
+
+		// do not proceed for graphical elements, which will have evident relationships to Diagrams (owner, etc.)
+		// not required for Table
+		// if(object instanceof View) {
+		// return super.getBeforeDuplicateCommand(request);
+		// }
+
+		// check for the element itself
+		Collection<Setting> settings = adapter.getInverseReferences(object, false);
+		for (Setting setting : settings) {
+			EObject value = setting.getEObject();
+			if (value instanceof Table) {
+				tablesToDuplicate.add((Table) value);
+			}
+		}
+
+		// check for sub-elements
+		for (Iterator<EObject> it = object.eAllContents(); it.hasNext();) {
+			EObject child = it.next();
+			settings = adapter.getInverseReferences(child, false);
+
+			for (Setting setting : settings) {
+				EObject value = setting.getEObject();
+				if (value instanceof Table) {
+					tablesToDuplicate.add((Table) value);
+				}
+			}
+		}
+
+
+		if (!tablesToDuplicate.isEmpty()) {
+			CompositeCommand command = null;
+			// create the command for all the Tables that have no command ready
+			for (Table TableToDuplicate : tablesToDuplicate) {
+				if (!duplicatedObjects.contains(TableToDuplicate)) {
+					if (command == null) {
+						command = new CompositeCommand("", Arrays.asList(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap()))); //$NON-NLS-1$ //$NON-NLS-2$
+					} else {
+						command.add(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap())); //$NON-NLS-1$
+					}
+					duplicatedObjects.add(TableToDuplicate);
+				}
+			}
+
+			if (command != null) {
+				if (super.getBeforeDuplicateCommand(request) != null) {
+					command.add(super.getBeforeDuplicateCommand(request));
+					return command.reduce();
+				} else {
+					return command.reduce();
+
+				}
+			}
+		}
+
+		return super.getBeforeDuplicateCommand(request);
+	}
+
+	/**
+	 * Returns the EObject to be duplicated
+	 *
+	 * @return the EObject to be duplicated
+	 */
+	protected EObject getDuplicatedEObject(DuplicateElementsRequest request) {
+		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();
+		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
+			return null;
+		}
+		Object elementToBeDuplicated = elementsToBeDuplicated.get(0);
+		if (elementToBeDuplicated instanceof EObject) {
+			return ((EObject) elementToBeDuplicated);
+		}
+		return null;
+	}
+
+	/**
+	 * Command to duplicate Tables. This adds the Table to the resource containing the source Table.
+	 */
+	public class DuplicateTableCommand extends DuplicateEObjectsCommand {
+
+		/** Table to be duplicated */
+		private final Table TableToDuplicate;
+
+		/**
+		 * Constructs a new duplicate EObjects command with the specified label and
+		 * list of EObjects.
+		 *
+		 * @param editingDomain
+		 *            the editing domain through which model changes are made
+		 * @param label
+		 *            The label for the new command.
+		 * @param Table
+		 *            <code>Table</code> to be duplicated.
+		 */
+		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table) {
+			super(editingDomain, label, Collections.singletonList(Table));
+			this.TableToDuplicate = Table;
+		}
+
+		/**
+		 * Constructs a new duplicate EObjects command with the specified label and
+		 * list of EObjects.
+		 *
+		 * @param editingDomain
+		 *            the editing domain through which model changes are made
+		 * @param label
+		 *            The label for the new command.
+		 * @param Table
+		 *            <code>Table</code> to be duplicated.
+		 * @param allDuplicatedObjectsMap
+		 *            An empty map to be populated with the duplicated objects.
+		 */
+		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap) {
+			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap);
+			this.TableToDuplicate = Table;
+		}
+
+		/**
+		 * Constructs a new duplicate EObjects command with the specified label and
+		 * list of EObjects. Also sets the list of affected files to be the files,
+		 * where the targetContainer is stored. Target container specifies the
+		 * eObject into which the duplicated eObjects will be added.
+		 *
+		 * @param editingDomain
+		 *            the editing domain through which model changes are made
+		 * @param label
+		 *            The label for the new command.
+		 * @param Table
+		 *            <code>Table</code> to be duplicated.
+		 * @param allDuplicatedObjectsMap
+		 *            An empty map to be populated with the duplicated objects.
+		 */
+		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap, EObject targetContainer) {
+			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap, targetContainer);
+			this.TableToDuplicate = Table;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			// Remove elements whose container is getting copied.
+			// ClipboardSupportUtil.getCopyElements(getObjectsToBeDuplicated());
+
+			// Perform the copy and update the references.
+			EcoreUtil.Copier copier = new TableCopier(getAllDuplicatedObjectsMap());
+			copier.copy(TableToDuplicate);
+			copier.copyReferences();
+
+			EObject duplicateTable = copier.get(TableToDuplicate);
+			Resource targetResource = getNotationResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());
+			Resource diTargetResource = getDiResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());
+
+			if (targetResource != null) {
+				targetResource.getContents().add(duplicateTable);
+
+				if (diTargetResource != null) {
+					try {
+						IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);
+						pageManager.addPage(duplicateTable);
+					} catch (ServiceException e) {
+						Activator.log.error(e);
+					}
+				} else {
+					Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$
+				}
+			} else {
+				Activator.log.warn("It was not possible to find the Resource with the target EObject"); //$NON-NLS-1$
+				targetResource = TableToDuplicate.eResource();
+				if (targetResource != null) {
+					Activator.log.error("It was not possible to find the Resource with the source Table", null); //$NON-NLS-1$
+					targetResource.getContents().add(duplicateTable);
+					if (diTargetResource != null) {
+						try {
+							IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);
+							pageManager.addPage(duplicateTable);
+						} catch (ServiceException e) {
+							Activator.log.error(e);
+						}
+					} else {
+						Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$
+					}
+				}
+			}
+			return CommandResult.newOKCommandResult(getAllDuplicatedObjectsMap());
+		}
+
+		@Override
+		public boolean canExecute() {
+			// should add some tests here? no need to test containement feature like previous, Table has no owner...
+			return true;
+		}
+	}
+
+	/**
+	 * Returns the notation resource where to add the new Table
+	 *
+	 * @param eObject
+	 *            the semantic object linked to the Table or the Table itself.
+	 * @param domain
+	 *            the editing domain
+	 * @return the resource where the Table should be added or <code>null</code> if no resource was found
+	 *         TODO this method should be handled by the resource plugin.
+	 */
+	public Resource getNotationResourceForTable(EObject eObject, TransactionalEditingDomain domain) {
+		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);
+		EObject semanticObject;
+		if (!(object instanceof EObject)) {
+			semanticObject = eObject;
+		} else {
+			semanticObject = (EObject) object;
+		}
+
+		Resource containerResource = semanticObject.eResource();
+		if (containerResource == null) {
+			return null;
+		}
+		// retrieve the model set from the container resource
+		ResourceSet resourceSet = containerResource.getResourceSet();
+
+		if (resourceSet instanceof ModelSet) {
+			ModelSet modelSet = (ModelSet) resourceSet;
+			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION, true);
+			return destinationResource;
+		} else {
+			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$
+		}
+	}
+
+
+	/**
+	 * Returns the di resource where to add the new Table
+	 *
+	 * @param eObject
+	 *            the semantic object linked to the Table or the Table itself.
+	 * @param domain
+	 *            the editing domain
+	 * @return the resource where the Table should be added or <code>null</code> if no resource was found
+	 */
+	public Resource getDiResourceForTable(EObject eObject, TransactionalEditingDomain domain) {
+		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);
+		EObject semanticObject;
+		if (!(object instanceof EObject)) {
+			semanticObject = eObject;
+		} else {
+			semanticObject = (EObject) object;
+		}
+
+		Resource containerResource = semanticObject.eResource();
+		if (containerResource == null) {
+			return null;
+		}
+		// retrieve the model set from the container resource
+		ResourceSet resourceSet = containerResource.getResourceSet();
+
+		if (resourceSet instanceof ModelSet) {
+			ModelSet modelSet = (ModelSet) resourceSet;
+			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, DiModel.DI_FILE_EXTENSION, true);
+			return destinationResource;
+		} else {
+			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Copier for Tables, where only views and internal references are duplicated, not the semantic elements themselves.
+	 */
+	protected class TableCopier extends EcoreUtil.Copier {
+
+		/** Serial UUID */
+		private static final long serialVersionUID = -1115934398631109073L;
+
+		/** semantic objects referenced by the views in the Table */
+		private Map<EObject, EObject> semanticObjects;
+
+		/**
+		 * Creates a new {@link TableCopier}
+		 *
+		 * @param semanticObjects
+		 *            list of semantic objects already copied, to which new views should be related.
+		 */
+		public TableCopier(Map<EObject, EObject> semanticObjects) {
+			this.semanticObjects = semanticObjects;
+		}
+
+		/**
+		 * Overrides the get to look in the map of duplicated semantic objects in case the element was not found in this map
+		 *
+		 * {@inheritDoc}
+		 */
+		@Override
+		public EObject get(Object arg0) {
+			EObject object = super.get(arg0);
+			if (object == null) {
+				object = semanticObjects.get(arg0);
+			}
+			return object;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
index d2b554f1511..a312d3ad93b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
@@ -1,33 +1,33 @@
-package org.eclipse.papyrus.infra.nattable.common.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.common.messages.messages"; //$NON-NLS-1$

-

-	public static String ChooseNattableConfigWizardPage_12;

-

-	public static String ChooseNattableConfigWizardPage_6;

-

-	public static String ChooseNattableConfigWizardPage_7;

-

-	public static String ChooseNattableConfigWizardPage_9;

-

-	public static String CreateNattableFromCatalogWizard_0;

-

-	public static String CreateNattableFromCatalogWizard_1;

-

-	public static String CreateNattableFromCatalogWizard_2;

-

-	public static String RenameTableHandler_NewName;

-

-	public static String RenameTableHandler_RenameAnExistingTable;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+package org.eclipse.papyrus.infra.nattable.common.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.common.messages.messages"; //$NON-NLS-1$
+
+	public static String ChooseNattableConfigWizardPage_12;
+
+	public static String ChooseNattableConfigWizardPage_6;
+
+	public static String ChooseNattableConfigWizardPage_7;
+
+	public static String ChooseNattableConfigWizardPage_9;
+
+	public static String CreateNattableFromCatalogWizard_0;
+
+	public static String CreateNattableFromCatalogWizard_1;
+
+	public static String CreateNattableFromCatalogWizard_2;
+
+	public static String RenameTableHandler_NewName;
+
+	public static String RenameTableHandler_RenameAnExistingTable;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
index d82e7085913..519171ccdce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
@@ -1,9 +1,9 @@
-ChooseNattableConfigWizardPage_12=Description

-ChooseNattableConfigWizardPage_6=Type

-ChooseNattableConfigWizardPage_7=Name

-ChooseNattableConfigWizardPage_9=Quantity

-CreateNattableFromCatalogWizard_0=Select a Table configuration from the catalog:

-CreateNattableFromCatalogWizard_1=Create a Table from an existing configuration

-CreateNattableFromCatalogWizard_2=Select table configuration

-RenameTableHandler_NewName=New name:

-RenameTableHandler_RenameAnExistingTable=Rename an existing table

+ChooseNattableConfigWizardPage_12=Description
+ChooseNattableConfigWizardPage_6=Type
+ChooseNattableConfigWizardPage_7=Name
+ChooseNattableConfigWizardPage_9=Quantity
+CreateNattableFromCatalogWizard_0=Select a Table configuration from the catalog:
+CreateNattableFromCatalogWizard_1=Create a Table from an existing configuration
+CreateNattableFromCatalogWizard_2=Select table configuration
+RenameTableHandler_NewName=New name:
+RenameTableHandler_RenameAnExistingTable=Rename an existing table
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
index eec7de7cfb4..7cd071f74a6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
@@ -1,83 +1,83 @@
-/*******************************************************************************

- * Copyright (c) 2009, 2010 Mia-Software.

- * 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 Bros (Mia-Software) - Bug 331203 - table model editor - initial API and implementation

- *    Nicolas Guyomar (Mia-Software) - Bug 332924 - To be able to save the table

- *    Nicolas Guyomar (Mia-Software) - Bug 333029 - To be able to save the size of the lines and the columns

- *******************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.utils;

-

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

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IPersistableElement;

-

-/**

- * Comes from org.eclipse.emf.facet.widget.nattable.workbench.

- *

- * This class should not be used by others plugins

- */

-public class TableEditorInput implements IEditorInput {

-

-	/** The input for the Table widget */

-	private final Table tableInstance;

-

-	/** A textual description of what is shown in the editor */

-	private final String description;

-

-	private final TransactionalEditingDomain editingDomain;

-

-	public TableEditorInput(final Table papyrusTable, final TransactionalEditingDomain editingDomain) {

-		this.tableInstance = papyrusTable;

-		this.description = papyrusTable.getDescription();

-		this.editingDomain = editingDomain;

-	}

-

-	public Table getPapyrusTableInstance() {

-		return this.tableInstance;

-	}

-

-	public String getDescription() {

-		return this.description;

-	}

-

-	@Override

-	public boolean exists() {

-		return false;

-	}

-

-	@Override

-	public ImageDescriptor getImageDescriptor() {

-		return null;

-	}

-

-	@Override

-	public String getName() {

-		return "Model Table"; //$NON-NLS-1$

-	}

-

-	@Override

-	public IPersistableElement getPersistable() {

-		return null;

-	}

-

-	@Override

-	public String getToolTipText() {

-		return "Model Table"; //$NON-NLS-1$

-	}

-

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {

-		return null;

-	}

-

-	protected TransactionalEditingDomain getEditingDomain() {

-		return this.editingDomain;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mia-Software.
+ * 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 Bros (Mia-Software) - Bug 331203 - table model editor - initial API and implementation
+ *    Nicolas Guyomar (Mia-Software) - Bug 332924 - To be able to save the table
+ *    Nicolas Guyomar (Mia-Software) - Bug 333029 - To be able to save the size of the lines and the columns
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.utils;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IPersistableElement;
+
+/**
+ * Comes from org.eclipse.emf.facet.widget.nattable.workbench.
+ *
+ * This class should not be used by others plugins
+ */
+public class TableEditorInput implements IEditorInput {
+
+	/** The input for the Table widget */
+	private final Table tableInstance;
+
+	/** A textual description of what is shown in the editor */
+	private final String description;
+
+	private final TransactionalEditingDomain editingDomain;
+
+	public TableEditorInput(final Table papyrusTable, final TransactionalEditingDomain editingDomain) {
+		this.tableInstance = papyrusTable;
+		this.description = papyrusTable.getDescription();
+		this.editingDomain = editingDomain;
+	}
+
+	public Table getPapyrusTableInstance() {
+		return this.tableInstance;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	@Override
+	public boolean exists() {
+		return false;
+	}
+
+	@Override
+	public ImageDescriptor getImageDescriptor() {
+		return null;
+	}
+
+	@Override
+	public String getName() {
+		return "Model Table"; //$NON-NLS-1$
+	}
+
+	@Override
+	public IPersistableElement getPersistable() {
+		return null;
+	}
+
+	@Override
+	public String getToolTipText() {
+		return "Model Table"; //$NON-NLS-1$
+	}
+
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {
+		return null;
+	}
+
+	protected TransactionalEditingDomain getEditingDomain() {
+		return this.editingDomain;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath
@@ -1,7 +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.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
index 03b904790d5..2d6a110f666 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,

- org.eclipse.papyrus.infra.nattable.controlmode.commands,

- org.eclipse.papyrus.infra.nattable.controlmode.helpers

-Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,
+ org.eclipse.papyrus.infra.nattable.controlmode.commands,
+ org.eclipse.papyrus.infra.nattable.controlmode.helpers
+Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
index 13d8ab0c295..3a5f221a9d4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.controlmode

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.controlmode
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Controlmode for Tables
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html
@@ -1,28 +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>

+<!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/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
index d16b1200471..eab8f10a1d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               build.properties,\

-               OSGI-INF/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               build.properties,\
+               OSGI-INF/,\
+               about.html
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
index 70491accd4c..04d7de33c64 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.controlmode.participant">

-      <participant

-            class="org.eclipse.papyrus.infra.nattable.controlmode.commands.PapyrusNattableControlModeParticipant">

-      </participant>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.services.controlmode.participant">
+      <participant
+            class="org.eclipse.papyrus.infra.nattable.controlmode.commands.PapyrusNattableControlModeParticipant">
+      </participant>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
index a613b3ee1d5..05fcc190b6d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
index dbb8a70654f..88b8051d9b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

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

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.controlmode;

-

-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.infra.nattable.controlmode"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

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

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.controlmode;
+
+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.infra.nattable.controlmode"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	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/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java
index d6b8801cd2b..2c93a235ea2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * 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.controlmode.commands;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;

-import org.eclipse.papyrus.infra.nattable.controlmode.Activator;

-import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequestParameters;

-

-import com.google.common.collect.Lists;

-

-

-public class PapyrusNattableControlCommand extends AbstractTransactionalCommand {

-

-	/**

-	 * Control request used to control tabs

-	 */

-	protected ControlModeRequest request;

-

-	/**

-	 * @param request

-	 *            {@link ControlTableCommand#request}

-	 */

-	@SuppressWarnings("unchecked")

-	public PapyrusNattableControlCommand(ControlModeRequest request) {

-		super(request.getEditingDomain(), "Move table to new resource", null);

-		this.request = request;

-

-		try {

-			getAffectedFiles().addAll(getWorkspaceFiles(getTables()));

-		} catch (ExecutionException e) {

-			Activator.log.error(e);

-		}

-	}

-

-	/**

-	 * Get all the tab that need to be moved

-	 *

-	 * @return

-	 * @throws ExecutionException

-	 */

-	protected List<EObject> getTables() throws ExecutionException {

-		return Lists.newArrayList(TableControlModeHelper.createDescendantTablesIterable(this.request.getTargetObject()));

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)

-	 *

-	 * @param monitor

-	 * @param info

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		EObject objectTOControl = request.getTargetObject();

-		EMFHelper.getUsages(objectTOControl);

-		// Retrieve new notation resource created previously

-		Resource newResource = getTargetResource();

-		if (newResource == null) {

-			return CommandResult.newErrorCommandResult(String.format("The target %s model has not been created", getTargetResourceFileExtension()));

-		}

-		List<EObject> tables = getTables();

-		if (!tables.isEmpty()) {

-			for (EObject tab : tables) {

-				if (tab instanceof Table) {

-					newResource.getContents().add(tab);

-				}

-			}

-			addMovedTabToRequest(tables);

-		}

-		return CommandResult.newOKCommandResult(newResource);

-	}

-

-	/**

-	 * Register the tab being moved to the request in ordert to be used by other participants

-	 *

-	 * @param tables

-	 */

-	public void addMovedTabToRequest(List<EObject> tables) {

-		@SuppressWarnings("unchecked")

-		Collection<EObject> openables = (Collection<EObject>) request.getParameter(ControlModeRequestParameters.MOVED_OPENABLES);

-		if (openables == null) {

-			openables = new ArrayList<EObject>();

-		}

-		openables.addAll(tables);

-		request.addParameters(Collections.singletonMap(ControlModeRequestParameters.MOVED_OPENABLES, openables));

-	}

-

-	/**

-	 * Retrieve the target resource from the request

-	 *

-	 * @return

-	 */

-	protected Resource getTargetResource() {

-		return request.getTargetResource(getTargetResourceFileExtension());

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the extension point of the target resource

-	 */

-	protected String getTargetResourceFileExtension() {

-		return PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION;

-	}

-}

+/*****************************************************************************
+ * 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.controlmode.commands;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;
+import org.eclipse.papyrus.infra.nattable.controlmode.Activator;
+import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequestParameters;
+
+import com.google.common.collect.Lists;
+
+
+public class PapyrusNattableControlCommand extends AbstractTransactionalCommand {
+
+	/**
+	 * Control request used to control tabs
+	 */
+	protected ControlModeRequest request;
+
+	/**
+	 * @param request
+	 *            {@link ControlTableCommand#request}
+	 */
+	@SuppressWarnings("unchecked")
+	public PapyrusNattableControlCommand(ControlModeRequest request) {
+		super(request.getEditingDomain(), "Move table to new resource", null);
+		this.request = request;
+
+		try {
+			getAffectedFiles().addAll(getWorkspaceFiles(getTables()));
+		} catch (ExecutionException e) {
+			Activator.log.error(e);
+		}
+	}
+
+	/**
+	 * Get all the tab that need to be moved
+	 *
+	 * @return
+	 * @throws ExecutionException
+	 */
+	protected List<EObject> getTables() throws ExecutionException {
+		return Lists.newArrayList(TableControlModeHelper.createDescendantTablesIterable(this.request.getTargetObject()));
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	 *
+	 * @param monitor
+	 * @param info
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		EObject objectTOControl = request.getTargetObject();
+		EMFHelper.getUsages(objectTOControl);
+		// Retrieve new notation resource created previously
+		Resource newResource = getTargetResource();
+		if (newResource == null) {
+			return CommandResult.newErrorCommandResult(String.format("The target %s model has not been created", getTargetResourceFileExtension()));
+		}
+		List<EObject> tables = getTables();
+		if (!tables.isEmpty()) {
+			for (EObject tab : tables) {
+				if (tab instanceof Table) {
+					newResource.getContents().add(tab);
+				}
+			}
+			addMovedTabToRequest(tables);
+		}
+		return CommandResult.newOKCommandResult(newResource);
+	}
+
+	/**
+	 * Register the tab being moved to the request in ordert to be used by other participants
+	 *
+	 * @param tables
+	 */
+	public void addMovedTabToRequest(List<EObject> tables) {
+		@SuppressWarnings("unchecked")
+		Collection<EObject> openables = (Collection<EObject>) request.getParameter(ControlModeRequestParameters.MOVED_OPENABLES);
+		if (openables == null) {
+			openables = new ArrayList<EObject>();
+		}
+		openables.addAll(tables);
+		request.addParameters(Collections.singletonMap(ControlModeRequestParameters.MOVED_OPENABLES, openables));
+	}
+
+	/**
+	 * Retrieve the target resource from the request
+	 *
+	 * @return
+	 */
+	protected Resource getTargetResource() {
+		return request.getTargetResource(getTargetResourceFileExtension());
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the extension point of the target resource
+	 */
+	protected String getTargetResourceFileExtension() {
+		return PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java
index e849de804b7..79cd331b2c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java
@@ -1,129 +1,129 @@
-/*****************************************************************************

- * 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.controlmode.commands;

-

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

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;

-import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;

-

-

-public class PapyrusNattableControlModeParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {

-

-	/** the ID for this control mode participant */

-	public static final String PARTICIPANT_ID = "org.eclipse.papyrus.infra.nattable.controlmode.NatTableControlModeParticipant";

-

-	@Override

-	public String getID() {

-		return PapyrusNattableControlModeParticipant.PARTICIPANT_ID;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlModeParticipant#getPriority()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getPriority() {

-		return 50;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#provideControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public boolean provideControlCommand(ControlModeRequest request) {

-		final EObject objectToControl = request.getTargetObject();

-		if (objectToControl == null) {

-			return false;

-		}

-		final Iterable<EObject> iter = TableControlModeHelper.createDescendantTablesIterable(objectToControl);

-		return iter.iterator().hasNext();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#provideUnControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public boolean provideUnControlCommand(ControlModeRequest request) {

-		return provideControlCommand(request);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPreUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPreUncontrolCommand(ControlModeRequest request) {

-		return new PapyrusNattableControlCommand(request);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPreControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPreControlCommand(ControlModeRequest request) {

-		// don't create the notation resource since it is already handled

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPostUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPostUncontrolCommand(ControlModeRequest request) {

-		// don't remove the notation resource

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPostControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPostControlCommand(ControlModeRequest request) {

-		return new PapyrusNattableControlCommand(request);

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.controlmode.commands;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;
+import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;
+
+
+public class PapyrusNattableControlModeParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {
+
+	/** the ID for this control mode participant */
+	public static final String PARTICIPANT_ID = "org.eclipse.papyrus.infra.nattable.controlmode.NatTableControlModeParticipant";
+
+	@Override
+	public String getID() {
+		return PapyrusNattableControlModeParticipant.PARTICIPANT_ID;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlModeParticipant#getPriority()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getPriority() {
+		return 50;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#provideControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public boolean provideControlCommand(ControlModeRequest request) {
+		final EObject objectToControl = request.getTargetObject();
+		if (objectToControl == null) {
+			return false;
+		}
+		final Iterable<EObject> iter = TableControlModeHelper.createDescendantTablesIterable(objectToControl);
+		return iter.iterator().hasNext();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#provideUnControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public boolean provideUnControlCommand(ControlModeRequest request) {
+		return provideControlCommand(request);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPreUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPreUncontrolCommand(ControlModeRequest request) {
+		return new PapyrusNattableControlCommand(request);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPreControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPreControlCommand(ControlModeRequest request) {
+		// don't create the notation resource since it is already handled
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPostUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPostUncontrolCommand(ControlModeRequest request) {
+		// don't remove the notation resource
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPostControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPostControlCommand(ControlModeRequest request) {
+		return new PapyrusNattableControlCommand(request);
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java
index 3b0cbca858c..b3324762767 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java
@@ -1,92 +1,92 @@
-/*****************************************************************************

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

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.controlmode.helpers;

-

-import java.util.Iterator;

-import java.util.Set;

-

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

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

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

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

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-import com.google.common.base.Function;

-import com.google.common.base.Predicate;

-import com.google.common.collect.Iterables;

-import com.google.common.collect.Iterators;

-import com.google.common.collect.Sets;

-

-

-public class TableControlModeHelper {

-

-	/**

-	 * Creates an iterable containing all the Papyrus Tables that are descending from the context.

-	 */

-	public static Iterable<EObject> createDescendantTablesIterable(EObject context) {

-

-		Set<EObject> result = Sets.newHashSet();

-

-		TreeIterator<EObject> eAllContents = EcoreUtil.getAllProperContents(context, true); // was context.eAllContents().

-		Iterator<EObject> contextAndDescendants = Iterators.concat(eAllContents, Iterators.singletonIterator(context));

-

-		/*

-		 * Predicate used to keep the usages which are PapyrusTableInstances

-		 */

-		Predicate<Setting> keepTableInstances = new Predicate<Setting>() {

-

-			@Override

-			public boolean apply(Setting setting) {

-				boolean result = true;

-				if (setting != null) {

-					EObject settingEObject = setting.getEObject();

-					result &= settingEObject instanceof Table;

-				} else {

-					result = false;

-				}

-				return result;

-			}

-		};

-

-		/*

-		 * Function to get the eObject from a setting

-		 */

-		Function<Setting, EObject> getEObject = new Function<Setting, EObject>() {

-

-			@Override

-			public EObject apply(Setting input) {

-				EObject settingEObject = input.getEObject();

-				return settingEObject;

-			}

-

-		};

-

-		/*

-		 * For the context and his descendants :

-		 */

-		while (contextAndDescendants.hasNext()) {

-			EObject current = contextAndDescendants.next();

-			// Usages

-			Iterable<Setting> usages = EMFHelper.getUsages(current);

-			// Filtering to keep only papyrus table instances.

-			Iterable<Setting> tableInstanceSettings = Iterables.filter(usages, keepTableInstances);

-			// Getting the eObjects

-			Iterable<EObject> papyrusTableInstances = Iterables.transform(tableInstanceSettings, getEObject);

-			// Adding all the kept usages.

-			Iterables.addAll(result, papyrusTableInstances);

-		}

-

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.controlmode.helpers;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Sets;
+
+
+public class TableControlModeHelper {
+
+	/**
+	 * Creates an iterable containing all the Papyrus Tables that are descending from the context.
+	 */
+	public static Iterable<EObject> createDescendantTablesIterable(EObject context) {
+
+		Set<EObject> result = Sets.newHashSet();
+
+		TreeIterator<EObject> eAllContents = EcoreUtil.getAllProperContents(context, true); // was context.eAllContents().
+		Iterator<EObject> contextAndDescendants = Iterators.concat(eAllContents, Iterators.singletonIterator(context));
+
+		/*
+		 * Predicate used to keep the usages which are PapyrusTableInstances
+		 */
+		Predicate<Setting> keepTableInstances = new Predicate<Setting>() {
+
+			@Override
+			public boolean apply(Setting setting) {
+				boolean result = true;
+				if (setting != null) {
+					EObject settingEObject = setting.getEObject();
+					result &= settingEObject instanceof Table;
+				} else {
+					result = false;
+				}
+				return result;
+			}
+		};
+
+		/*
+		 * Function to get the eObject from a setting
+		 */
+		Function<Setting, EObject> getEObject = new Function<Setting, EObject>() {
+
+			@Override
+			public EObject apply(Setting input) {
+				EObject settingEObject = input.getEObject();
+				return settingEObject;
+			}
+
+		};
+
+		/*
+		 * For the context and his descendants :
+		 */
+		while (contextAndDescendants.hasNext()) {
+			EObject current = contextAndDescendants.next();
+			// Usages
+			Iterable<Setting> usages = EMFHelper.getUsages(current);
+			// Filtering to keep only papyrus table instances.
+			Iterable<Setting> tableInstanceSettings = Iterables.filter(usages, keepTableInstances);
+			// Getting the eObjects
+			Iterable<EObject> papyrusTableInstances = Iterables.transform(tableInstanceSettings, getEObject);
+			// Adding all the kept usages.
+			Iterables.addAll(result, papyrusTableInstances);
+		}
+
+		return result;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
index a0997057a84..4d1016adae1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.internal.gmfdiag.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.gmfdiag;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.nattable.internal.gmfdiag;x-internal:=true,

- org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste;x-internal:=true

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.internal.gmfdiag.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.gmfdiag;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.nattable.internal.gmfdiag;x-internal:=true,
+ org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste;x-internal:=true
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.6

-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

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+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/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs
index 01d704bd380..954281dbc31 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -1,68 +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>

+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/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
index bc7df71dbf4..456eaaeae82 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
@@ -1,21 +1,21 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
index 3d7e3222abf..0135897dc24 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
@@ -1,175 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2013 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

- 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+ 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
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 f08f527589a..02ce63b3a20 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
@@ -1,200 +1,200 @@
-/**

- * 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.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.AxisGroup;

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

-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.AxisGroup} object.

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

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

- * @generated

- */

-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) {

-		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);

-			addGroupedAxisPropertyDescriptor(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 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));

-	}

-

-	/**

-	 * This returns AxisGroup.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(AxisGroup.class)) {

-			case NattableaxisPackage.AXIS_GROUP__ALIAS:

-				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);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.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.AxisGroup;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+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.AxisGroup} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+			addGroupedAxisPropertyDescriptor(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 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));
+	}
+
+	/**
+	 * This returns AxisGroup.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisGroup")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(AxisGroup.class)) {
+			case NattableaxisPackage.AXIS_GROUP__ALIAS:
+				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);
+	}
+
+	/**
+	 * 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/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 17ccbee6927..28213e0f4ef 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
@@ -1,132 +1,132 @@
-/**

- * 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.EObjectAxis;

-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.EObjectAxis} object.

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

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

- * @generated

- */

-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) {

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

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

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

-	}

-

-}

+/**
+ * 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.EObjectAxis;
+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.EObjectAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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_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
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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/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 ff17d5bbd02..270268da884 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
@@ -1,186 +1,186 @@
-/**

- * 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.EObjectTreeItemAxis;

-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.EObjectTreeItemAxis} object.

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

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

- * @generated

- */

-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) {

-		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 EObjectTreeItemAxis.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(EObjectTreeItemAxis.class)) {

-			case NattableaxisPackage.EOBJECT_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);

-	}

-

-}

+/**
+ * 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.EObjectTreeItemAxis;
+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.EObjectTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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 EObjectTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectTreeItemAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(EObjectTreeItemAxis.class)) {
+			case NattableaxisPackage.EOBJECT_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/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
index 6cc120beadc..ccd09f9e9eb 100644
--- 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
@@ -1,134 +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);

-	}

-

-}

+/**
+ * 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
index c7311fa918c..2f24075eb3c 100644
--- 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
@@ -1,188 +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);

-	}

-

-}

+/**
+ * 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 61048e4a08d..aab11afaf5f 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
@@ -1,132 +1,132 @@
-/**

- * 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.EStructuralFeatureAxis;

-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.EStructuralFeatureAxis} object.

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

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

- * @generated

- */

-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) {

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

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

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

-	}

-

-}

+/**
+ * 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.EStructuralFeatureAxis;
+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.EStructuralFeatureAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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_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
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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/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 568383e6e94..e8fd2009e6f 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
@@ -1,186 +1,186 @@
-/**

- * 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.EStructuralFeatureTreeItemAxis;

-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.EStructuralFeatureTreeItemAxis} object.

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

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

- * @generated

- */

-public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatureAxisItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

-	public EStructuralFeatureTreeItemAxisItemProvider(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 EStructuralFeatureTreeItemAxis.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(EStructuralFeatureTreeItemAxis.class)) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_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);

-	}

-

-}

+/**
+ * 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.EStructuralFeatureTreeItemAxis;
+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.EStructuralFeatureTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatureAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeatureTreeItemAxisItemProvider(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 EStructuralFeatureTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureTreeItemAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(EStructuralFeatureTreeItemAxis.class)) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_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/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 712ba4b4660..6d21d92e0ee 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
@@ -1,206 +1,206 @@
-/**

- * 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.FeatureAxis;

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

-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.FeatureAxis} object.

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

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

- * @generated

- */

-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) {

-		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.FEATURE_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 = ((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$

-	}

-

-

-	/**

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

-		}

-		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.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+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.FeatureAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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.FEATURE_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 = ((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$
+	}
+
+
+	/**
+	 * 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(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;
+		}
+		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.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));
+	}
+
+	/**
+	 * 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/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 8f081f1018e..9e1318a8e4c 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
@@ -1,152 +1,152 @@
-/**

- * 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.ecore.EStructuralFeature;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

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

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

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public FeatureIdAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This 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.FEATURE_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 FeatureIdAxis.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(FeatureIdAxis.class)) {

-			case NattableaxisPackage.FEATURE_ID_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.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-}

+/**
+ * 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.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureIdAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This 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.FEATURE_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 FeatureIdAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureIdAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(FeatureIdAxis.class)) {
+			case NattableaxisPackage.FEATURE_ID_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.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 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 4db208141ae..a6513103d3b 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
@@ -1,186 +1,186 @@
-/**

- * 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.FeatureIdTreeItemAxis;

-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.FeatureIdTreeItemAxis} object.

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

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

- * @generated

- */

-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) {

-		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 FeatureIdTreeItemAxis.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(FeatureIdTreeItemAxis.class)) {

-			case NattableaxisPackage.FEATURE_ID_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);

-	}

-

-}

+/**
+ * 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.FeatureIdTreeItemAxis;
+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.FeatureIdTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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 FeatureIdTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureIdTreeItemAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(FeatureIdTreeItemAxis.class)) {
+			case NattableaxisPackage.FEATURE_ID_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/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 7057c86f26e..f8614d632c0 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
@@ -1,175 +1,175 @@
-/**

- * 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.FeatureTreeItemAxis;

-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.FeatureTreeItemAxis} object.

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

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

- * @generated

- */

-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) {

-		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 = ((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$

-	}

-

-

-	/**

-	 * 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(FeatureTreeItemAxis.class)) {

-			case NattableaxisPackage.FEATURE_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);

-	}

-

-}

+/**
+ * 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.FeatureTreeItemAxis;
+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.FeatureTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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 = ((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$
+	}
+
+
+	/**
+	 * 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(FeatureTreeItemAxis.class)) {
+			case NattableaxisPackage.FEATURE_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/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 c7217600102..8e416627b28 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
@@ -1,190 +1,190 @@
-/**

- * 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.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.IdAxis;

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

-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.IdAxis} object.

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

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

- * @generated

- */

-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) {

-		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);

-			addElementPropertyDescriptor(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 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));

-	}

-

-	/**

-	 * 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();

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

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

-			getString("_UI_IdAxis_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(IdAxis.class)) {

-			case NattableaxisPackage.ID_AXIS__ALIAS:

-			case NattableaxisPackage.ID_AXIS__ELEMENT:

-				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);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.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.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+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.IdAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+			addElementPropertyDescriptor(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 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));
+	}
+
+	/**
+	 * 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();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IdAxis_type") : //$NON-NLS-1$
+			getString("_UI_IdAxis_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(IdAxis.class)) {
+			case NattableaxisPackage.ID_AXIS__ALIAS:
+			case NattableaxisPackage.ID_AXIS__ELEMENT:
+				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);
+	}
+
+	/**
+	 * 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/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 51a4fb44f30..92c61aac84d 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
@@ -1,186 +1,186 @@
-/**

- * 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.IdTreeItemAxis;

-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.IdTreeItemAxis} object.

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

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

- * @generated

- */

-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) {

-		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 IdTreeItemAxis.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(IdTreeItemAxis.class)) {

-			case NattableaxisPackage.ID_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);

-	}

-

-}

+/**
+ * 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.IdTreeItemAxis;
+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.IdTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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 IdTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IdTreeItemAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(IdTreeItemAxis.class)) {
+			case NattableaxisPackage.ID_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/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 9c3dc0d0b83..e7f6c46bc69 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
@@ -1,477 +1,477 @@
-/**

- * 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.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

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

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

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util.NattableaxisAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

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

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 * @generated

-	 */

-	public NattableaxisItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createIdTreeItemAxisAdapter() {

-		if (idTreeItemAxisItemProvider == null) {

-			idTreeItemAxisItemProvider = new IdTreeItemAxisItemProvider(this);

-		}

-

-		return idTreeItemAxisItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectAxisAdapter() {

-		if (eObjectAxisItemProvider == null) {

-			eObjectAxisItemProvider = new EObjectAxisItemProvider(this);

-		}

-

-		return eObjectAxisItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectTreeItemAxisAdapter() {

-		if (eObjectTreeItemAxisItemProvider == null) {

-			eObjectTreeItemAxisItemProvider = new EObjectTreeItemAxisItemProvider(this);

-		}

-

-		return eObjectTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * 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 FeatureIdAxisItemProvider featureIdAxisItemProvider;

-

-	/**

-	 * 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 createFeatureIdAxisAdapter() {

-		if (featureIdAxisItemProvider == null) {

-			featureIdAxisItemProvider = new FeatureIdAxisItemProvider(this);

-		}

-

-		return featureIdAxisItemProvider;

-	}

-

-	/**

-	 * 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 FeatureIdTreeItemAxisItemProvider featureIdTreeItemAxisItemProvider;

-

-	/**

-	 * 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 createFeatureIdTreeItemAxisAdapter() {

-		if (featureIdTreeItemAxisItemProvider == null) {

-			featureIdTreeItemAxisItemProvider = new FeatureIdTreeItemAxisItemProvider(this);

-		}

-

-		return featureIdTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * 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 EStructuralFeatureAxisItemProvider eStructuralFeatureAxisItemProvider;

-

-	/**

-	 * 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 createEStructuralFeatureAxisAdapter() {

-		if (eStructuralFeatureAxisItemProvider == null) {

-			eStructuralFeatureAxisItemProvider = new EStructuralFeatureAxisItemProvider(this);

-		}

-

-		return eStructuralFeatureAxisItemProvider;

-	}

-

-	/**

-	 * 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 EOperationAxisItemProvider eOperationAxisItemProvider;

-

-	/**

-	 * 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 createEOperationAxisAdapter() {

-		if (eOperationAxisItemProvider == null) {

-			eOperationAxisItemProvider = new EOperationAxisItemProvider(this);

-		}

-

-		return eOperationAxisItemProvider;

-	}

-

-	/**

-	 * 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 EStructuralFeatureTreeItemAxisItemProvider eStructuralFeatureTreeItemAxisItemProvider;

-

-	/**

-	 * 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 createEStructuralFeatureTreeItemAxisAdapter() {

-		if (eStructuralFeatureTreeItemAxisItemProvider == null) {

-			eStructuralFeatureTreeItemAxisItemProvider = new EStructuralFeatureTreeItemAxisItemProvider(this);

-		}

-

-		return eStructuralFeatureTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * 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 EOperationTreeItemAxisItemProvider eOperationTreeItemAxisItemProvider;

-

-	/**

-	 * 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 createEOperationTreeItemAxisAdapter() {

-		if (eOperationTreeItemAxisItemProvider == null) {

-			eOperationTreeItemAxisItemProvider = new EOperationTreeItemAxisItemProvider(this);

-		}

-

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createObjectIdAxisAdapter() {

-		if (objectIdAxisItemProvider == null) {

-			objectIdAxisItemProvider = new ObjectIdAxisItemProvider(this);

-		}

-

-		return objectIdAxisItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createObjectIdTreeItemAxisAdapter() {

-		if (objectIdTreeItemAxisItemProvider == null) {

-			objectIdTreeItemAxisItemProvider = new ObjectIdTreeItemAxisItemProvider(this);

-		}

-

-		return objectIdTreeItemAxisItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createAxisGroupAdapter() {

-		if (axisGroupItemProvider == null) {

-			axisGroupItemProvider = new AxisGroupItemProvider(this);

-		}

-

-		return axisGroupItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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 (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();

-	}

-

-}

+/**
+ * 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.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util.NattableaxisAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIdTreeItemAxisAdapter() {
+		if (idTreeItemAxisItemProvider == null) {
+			idTreeItemAxisItemProvider = new IdTreeItemAxisItemProvider(this);
+		}
+
+		return idTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectAxisAdapter() {
+		if (eObjectAxisItemProvider == null) {
+			eObjectAxisItemProvider = new EObjectAxisItemProvider(this);
+		}
+
+		return eObjectAxisItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectTreeItemAxisAdapter() {
+		if (eObjectTreeItemAxisItemProvider == null) {
+			eObjectTreeItemAxisItemProvider = new EObjectTreeItemAxisItemProvider(this);
+		}
+
+		return eObjectTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * 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 FeatureIdAxisItemProvider featureIdAxisItemProvider;
+
+	/**
+	 * 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 createFeatureIdAxisAdapter() {
+		if (featureIdAxisItemProvider == null) {
+			featureIdAxisItemProvider = new FeatureIdAxisItemProvider(this);
+		}
+
+		return featureIdAxisItemProvider;
+	}
+
+	/**
+	 * 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 FeatureIdTreeItemAxisItemProvider featureIdTreeItemAxisItemProvider;
+
+	/**
+	 * 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 createFeatureIdTreeItemAxisAdapter() {
+		if (featureIdTreeItemAxisItemProvider == null) {
+			featureIdTreeItemAxisItemProvider = new FeatureIdTreeItemAxisItemProvider(this);
+		}
+
+		return featureIdTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * 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 EStructuralFeatureAxisItemProvider eStructuralFeatureAxisItemProvider;
+
+	/**
+	 * 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 createEStructuralFeatureAxisAdapter() {
+		if (eStructuralFeatureAxisItemProvider == null) {
+			eStructuralFeatureAxisItemProvider = new EStructuralFeatureAxisItemProvider(this);
+		}
+
+		return eStructuralFeatureAxisItemProvider;
+	}
+
+	/**
+	 * 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 EOperationAxisItemProvider eOperationAxisItemProvider;
+
+	/**
+	 * 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 createEOperationAxisAdapter() {
+		if (eOperationAxisItemProvider == null) {
+			eOperationAxisItemProvider = new EOperationAxisItemProvider(this);
+		}
+
+		return eOperationAxisItemProvider;
+	}
+
+	/**
+	 * 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 EStructuralFeatureTreeItemAxisItemProvider eStructuralFeatureTreeItemAxisItemProvider;
+
+	/**
+	 * 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 createEStructuralFeatureTreeItemAxisAdapter() {
+		if (eStructuralFeatureTreeItemAxisItemProvider == null) {
+			eStructuralFeatureTreeItemAxisItemProvider = new EStructuralFeatureTreeItemAxisItemProvider(this);
+		}
+
+		return eStructuralFeatureTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * 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 EOperationTreeItemAxisItemProvider eOperationTreeItemAxisItemProvider;
+
+	/**
+	 * 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 createEOperationTreeItemAxisAdapter() {
+		if (eOperationTreeItemAxisItemProvider == null) {
+			eOperationTreeItemAxisItemProvider = new EOperationTreeItemAxisItemProvider(this);
+		}
+
+		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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createObjectIdAxisAdapter() {
+		if (objectIdAxisItemProvider == null) {
+			objectIdAxisItemProvider = new ObjectIdAxisItemProvider(this);
+		}
+
+		return objectIdAxisItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createObjectIdTreeItemAxisAdapter() {
+		if (objectIdTreeItemAxisItemProvider == null) {
+			objectIdTreeItemAxisItemProvider = new ObjectIdTreeItemAxisItemProvider(this);
+		}
+
+		return objectIdTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAxisGroupAdapter() {
+		if (axisGroupItemProvider == null) {
+			axisGroupItemProvider = new AxisGroupItemProvider(this);
+		}
+
+		return axisGroupItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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 (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 9405cbb3c8b..dcf98bb69c4 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
@@ -1,216 +1,216 @@
-/**

- * 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.ObjectAxis;

-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.ObjectAxis} object.

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

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

- * @generated

- */

-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) {

-		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.OBJECT_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 = ((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$

-	}

-

-

-	/**

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

-		}

-		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.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 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

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.ObjectAxis;
+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.ObjectAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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.OBJECT_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 = ((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$
+	}
+
+
+	/**
+	 * 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(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;
+		}
+		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.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 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
+	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/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 7affb62befd..e994f857553 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
@@ -1,162 +1,162 @@
-/**

- * 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.ecore.EStructuralFeature;

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

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

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

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public ObjectIdAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This 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.OBJECT_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 ObjectIdAxis.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(ObjectIdAxis.class)) {

-			case NattableaxisPackage.OBJECT_ID_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.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

-	}

-

-}

+/**
+ * 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.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+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.ObjectIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectIdAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This 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.OBJECT_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 ObjectIdAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectIdAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(ObjectIdAxis.class)) {
+			case NattableaxisPackage.OBJECT_ID_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.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 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 4f995133542..789f0a2ba11 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
@@ -1,186 +1,186 @@
-/**

- * 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.ObjectIdTreeItemAxis;

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public ObjectIdTreeItemAxisItemProvider(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 ObjectIdTreeItemAxis.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(ObjectIdTreeItemAxis.class)) {

-			case NattableaxisPackage.OBJECT_ID_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);

-	}

-

-}

+/**
+ * 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.ObjectIdTreeItemAxis;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectIdTreeItemAxisItemProvider(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 ObjectIdTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectIdTreeItemAxis")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(ObjectIdTreeItemAxis.class)) {
+			case NattableaxisPackage.OBJECT_ID_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/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 2282e6f0a39..04bf2ff19cb 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
@@ -1,175 +1,175 @@
-/**

- * 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.ObjectTreeItemAxis;

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public ObjectTreeItemAxisItemProvider(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 = ((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$

-	}

-

-

-	/**

-	 * 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(ObjectTreeItemAxis.class)) {

-			case NattableaxisPackage.OBJECT_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);

-	}

-

-}

+/**
+ * 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.ObjectTreeItemAxis;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectTreeItemAxisItemProvider(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 = ((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$
+	}
+
+
+	/**
+	 * 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(ObjectTreeItemAxis.class)) {
+			case NattableaxisPackage.OBJECT_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/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
index c06c60353eb..946d7793396 100644
--- 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
@@ -1,213 +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;

-	}

-

-}

+/**
+ * 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
index 210d12b924a..588524a87cc 100644
--- 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
@@ -1,177 +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);

-	}

-

-}

+/**
+ * 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 9ede05a4f89..aa41d8415e1 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
@@ -1,295 +1,295 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.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.nattableaxisconfiguration.AbstractHeaderAxisConfiguration} object.

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

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

- * @generated

- */

-public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addIndexStylePropertyDescriptor(object);

-			addDisplayLabelPropertyDescriptor(object);

-			addDisplayFilterPropertyDescriptor(object);

-			addDisplayIndexPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * 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(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);

-		}

-		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) {

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

-	}

-

-

-	/**

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

-		}

-		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

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(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()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createEStructuralFeatureValueFillingConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createIPasteConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration()));

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.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.nattableaxisconfiguration.AbstractHeaderAxisConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractHeaderAxisConfigurationItemProvider(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);
+
+			addIndexStylePropertyDescriptor(object);
+			addDisplayLabelPropertyDescriptor(object);
+			addDisplayFilterPropertyDescriptor(object);
+			addDisplayIndexPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);
+		}
+		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) {
+		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$
+	}
+
+
+	/**
+	 * 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(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;
+		}
+		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
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,
+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,
+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(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()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createEStructuralFeatureValueFillingConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createIPasteConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration()));
+	}
+
+	/**
+	 * 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/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 f6dc84f9f43..21786b361cc 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
@@ -1,188 +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.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-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.nattableaxisconfiguration.AxisManagerConfiguration} object.

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

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

- * @generated

- */

-public class AxisManagerConfigurationItemProvider extends StyledElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addLocalHeaderLabelConfigurationPropertyDescriptor(object);

-			addAxisManagerPropertyDescriptor(object);

-			addLocalSpecificConfigurationsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * This returns AxisManagerConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisManagerConfiguration")); //$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) {

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

-	}

-

-

-	/**

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

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

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

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

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+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.nattableaxisconfiguration.AxisManagerConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AxisManagerConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerConfigurationItemProvider(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);
+
+			addLocalHeaderLabelConfigurationPropertyDescriptor(object);
+			addAxisManagerPropertyDescriptor(object);
+			addLocalSpecificConfigurationsPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns AxisManagerConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisManagerConfiguration")); //$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) {
+		return getString("_UI_AxisManagerConfiguration_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 565cf2ed59f..a76e39e57f0 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
@@ -1,224 +1,224 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

-import org.eclipse.emf.edit.provider.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.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-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.nattableaxisconfiguration.AxisManagerRepresentation} object.

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

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

- * @generated

- */

-public class AxisManagerRepresentationItemProvider extends StyledElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addAxisManagerIdPropertyDescriptor(object);

-			addLabelProviderContextPropertyDescriptor(object);

-			addHeaderLabelConfigurationPropertyDescriptor(object);

-			addSpecificAxisConfigurationsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * This returns AxisManagerRepresentation.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

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

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.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.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+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.nattableaxisconfiguration.AxisManagerRepresentation} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AxisManagerRepresentationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentationItemProvider(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);
+
+			addAxisManagerIdPropertyDescriptor(object);
+			addLabelProviderContextPropertyDescriptor(object);
+			addHeaderLabelConfigurationPropertyDescriptor(object);
+			addSpecificAxisConfigurationsPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns AxisManagerRepresentation.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisManagerRepresentation")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(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;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 6492ec66b0d..05b68a628e6 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
@@ -1,142 +1,142 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-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.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} object.

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

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

- * @generated

- */

-public class EStructuralFeatureValueFillingConfigurationItemProvider extends StyledElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addListenFeaturePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

-	 * This returns EStructuralFeatureValueFillingConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureValueFillingConfiguration")); //$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) {

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

-	}

-

-

-	/**

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

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

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

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

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+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.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EStructuralFeatureValueFillingConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeatureValueFillingConfigurationItemProvider(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);
+
+			addListenFeaturePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns EStructuralFeatureValueFillingConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureValueFillingConfiguration")); //$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) {
+		return getString("_UI_EStructuralFeatureValueFillingConfiguration_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 13f0b34af08..ad5665c044b 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
@@ -1,152 +1,152 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

-import org.eclipse.emf.edit.provider.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.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-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.nattableaxisconfiguration.FeatureAxisConfiguration} object.

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

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

- * @generated

- */

-public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addShowOnlyCommonFeaturePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

-	 * This returns FeatureAxisConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureAxisConfiguration")); //$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) {

-		FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)object;

-		return getString("_UI_FeatureAxisConfiguration_type") + " " + featureAxisConfiguration.isShowOnlyCommonFeature(); //$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(FeatureAxisConfiguration.class)) {

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-				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);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.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.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+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.nattableaxisconfiguration.FeatureAxisConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureAxisConfigurationItemProvider(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);
+
+			addShowOnlyCommonFeaturePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns FeatureAxisConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureAxisConfiguration")); //$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) {
+		FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)object;
+		return getString("_UI_FeatureAxisConfiguration_type") + " " + featureAxisConfiguration.isShowOnlyCommonFeature(); //$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(FeatureAxisConfiguration.class)) {
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
+				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);
+	}
+
+	/**
+	 * 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/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 b34be29eeaa..3278391290d 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
@@ -1,176 +1,176 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

-import org.eclipse.emf.edit.provider.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.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-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.nattableaxisconfiguration.IPasteConfiguration} object.

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

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

- * @generated

- */

-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) {

-		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);

-

-			addPostActionsPropertyDescriptor(object);

-			addDetachedModePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * This returns IPasteConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IPasteConfiguration")); //$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) {

-		IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)object;

-		return getString("_UI_IPasteConfiguration_type") + " " + iPasteConfiguration.isDetachedMode(); //$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(IPasteConfiguration.class)) {

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-				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);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.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.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+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.nattableaxisconfiguration.IPasteConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+
+			addPostActionsPropertyDescriptor(object);
+			addDetachedModePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns IPasteConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IPasteConfiguration")); //$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) {
+		IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)object;
+		return getString("_UI_IPasteConfiguration_type") + " " + iPasteConfiguration.isDetachedMode(); //$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(IPasteConfiguration.class)) {
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
+				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);
+	}
+
+	/**
+	 * 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/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 eca21111524..632bb2ebf41 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
@@ -1,154 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.ecore.EStructuralFeature;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public LocalTableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This 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(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);

-		}

-		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 LocalTableHeaderAxisConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LocalTableHeaderAxisConfiguration")); //$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) {

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

-	}

-

-

-	/**

-	 * 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(LocalTableHeaderAxisConfiguration.class)) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				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

-				(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LocalTableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This 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(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);
+		}
+		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 LocalTableHeaderAxisConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/LocalTableHeaderAxisConfiguration")); //$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) {
+		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$
+	}
+
+
+	/**
+	 * 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(LocalTableHeaderAxisConfiguration.class)) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				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
+				(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS,
+				 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 f2105ea9328..5336d7e5570 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
@@ -1,405 +1,405 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

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

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

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util.NattableaxisconfigurationAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

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

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 * @generated

-	 */

-	public NattableaxisconfigurationItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createAxisManagerRepresentationAdapter() {

-		if (axisManagerRepresentationItemProvider == null) {

-			axisManagerRepresentationItemProvider = new AxisManagerRepresentationItemProvider(this);

-		}

-

-		return axisManagerRepresentationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createAxisManagerConfigurationAdapter() {

-		if (axisManagerConfigurationItemProvider == null) {

-			axisManagerConfigurationItemProvider = new AxisManagerConfigurationItemProvider(this);

-		}

-

-		return axisManagerConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableHeaderAxisConfigurationAdapter() {

-		if (tableHeaderAxisConfigurationItemProvider == null) {

-			tableHeaderAxisConfigurationItemProvider = new TableHeaderAxisConfigurationItemProvider(this);

-		}

-

-		return tableHeaderAxisConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {

-		if (localTableHeaderAxisConfigurationItemProvider == null) {

-			localTableHeaderAxisConfigurationItemProvider = new LocalTableHeaderAxisConfigurationItemProvider(this);

-		}

-

-		return localTableHeaderAxisConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createFeatureAxisConfigurationAdapter() {

-		if (featureAxisConfigurationItemProvider == null) {

-			featureAxisConfigurationItemProvider = new FeatureAxisConfigurationItemProvider(this);

-		}

-

-		return featureAxisConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {

-		if (eStructuralFeatureValueFillingConfigurationItemProvider == null) {

-			eStructuralFeatureValueFillingConfigurationItemProvider = new EStructuralFeatureValueFillingConfigurationItemProvider(this);

-		}

-

-		return eStructuralFeatureValueFillingConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createIPasteConfigurationAdapter() {

-		if (iPasteConfigurationItemProvider == null) {

-			iPasteConfigurationItemProvider = new IPasteConfigurationItemProvider(this);

-		}

-

-		return iPasteConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createPasteEObjectConfigurationAdapter() {

-		if (pasteEObjectConfigurationItemProvider == null) {

-			pasteEObjectConfigurationItemProvider = new PasteEObjectConfigurationItemProvider(this);

-		}

-

-		return pasteEObjectConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createTreeFillingConfigurationAdapter() {

-		if (treeFillingConfigurationItemProvider == null) {

-			treeFillingConfigurationItemProvider = new TreeFillingConfigurationItemProvider(this);

-		}

-

-		return treeFillingConfigurationItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util.NattableaxisconfigurationAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAxisManagerRepresentationAdapter() {
+		if (axisManagerRepresentationItemProvider == null) {
+			axisManagerRepresentationItemProvider = new AxisManagerRepresentationItemProvider(this);
+		}
+
+		return axisManagerRepresentationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAxisManagerConfigurationAdapter() {
+		if (axisManagerConfigurationItemProvider == null) {
+			axisManagerConfigurationItemProvider = new AxisManagerConfigurationItemProvider(this);
+		}
+
+		return axisManagerConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableHeaderAxisConfigurationAdapter() {
+		if (tableHeaderAxisConfigurationItemProvider == null) {
+			tableHeaderAxisConfigurationItemProvider = new TableHeaderAxisConfigurationItemProvider(this);
+		}
+
+		return tableHeaderAxisConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {
+		if (localTableHeaderAxisConfigurationItemProvider == null) {
+			localTableHeaderAxisConfigurationItemProvider = new LocalTableHeaderAxisConfigurationItemProvider(this);
+		}
+
+		return localTableHeaderAxisConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFeatureAxisConfigurationAdapter() {
+		if (featureAxisConfigurationItemProvider == null) {
+			featureAxisConfigurationItemProvider = new FeatureAxisConfigurationItemProvider(this);
+		}
+
+		return featureAxisConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {
+		if (eStructuralFeatureValueFillingConfigurationItemProvider == null) {
+			eStructuralFeatureValueFillingConfigurationItemProvider = new EStructuralFeatureValueFillingConfigurationItemProvider(this);
+		}
+
+		return eStructuralFeatureValueFillingConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIPasteConfigurationAdapter() {
+		if (iPasteConfigurationItemProvider == null) {
+			iPasteConfigurationItemProvider = new IPasteConfigurationItemProvider(this);
+		}
+
+		return iPasteConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPasteEObjectConfigurationAdapter() {
+		if (pasteEObjectConfigurationItemProvider == null) {
+			pasteEObjectConfigurationItemProvider = new PasteEObjectConfigurationItemProvider(this);
+		}
+
+		return pasteEObjectConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTreeFillingConfigurationAdapter() {
+		if (treeFillingConfigurationItemProvider == null) {
+			treeFillingConfigurationItemProvider = new TreeFillingConfigurationItemProvider(this);
+		}
+
+		return treeFillingConfigurationItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+}
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 9f6aee2495b..0527cfe529a 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
@@ -1,154 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.ecore.EStructuralFeature;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public TableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This 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(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

-		}

-		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 TableHeaderAxisConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableHeaderAxisConfiguration")); //$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) {

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

-	}

-

-

-	/**

-	 * 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(TableHeaderAxisConfiguration.class)) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				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

-				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerRepresentation()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This 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(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);
+		}
+		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 TableHeaderAxisConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableHeaderAxisConfiguration")); //$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) {
+		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$
+	}
+
+
+	/**
+	 * 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(TableHeaderAxisConfiguration.class)) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				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
+				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS,
+				 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 7ec83e0fc4b..ecabb18406c 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
@@ -1,350 +1,350 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.emf.expressions.booleanexpressions.BooleanExpressionsFactory;

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-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.nattableaxisconfiguration.TreeFillingConfiguration} object.

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

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

- * @generated

- */

-public class TreeFillingConfigurationItemProvider extends StyledElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addPasteConfigurationPropertyDescriptor(object);

-			addDepthPropertyDescriptor(object);

-			addLabelProviderPropertyDescriptor(object);

-			addLabelProviderContextPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * 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(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE);

-		}

-		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 TreeFillingConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeFillingConfiguration")); //$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) {

-		TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)object;

-		return getString("_UI_TreeFillingConfiguration_type") + " " + treeFillingConfiguration.getDepth(); //$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(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:

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				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

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createAxisGroup()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.emf.expressions.booleanexpressions.BooleanExpressionsFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+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.nattableaxisconfiguration.TreeFillingConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TreeFillingConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TreeFillingConfigurationItemProvider(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);
+
+			addPasteConfigurationPropertyDescriptor(object);
+			addDepthPropertyDescriptor(object);
+			addLabelProviderPropertyDescriptor(object);
+			addLabelProviderContextPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE);
+		}
+		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 TreeFillingConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeFillingConfiguration")); //$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) {
+		TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)object;
+		return getString("_UI_TreeFillingConfiguration_type") + " " + treeFillingConfiguration.getDepth(); //$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(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:
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				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
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createAxisGroup()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
+	}
+
+	/**
+	 * 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/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 c08cd2b0763..edf33a362a5 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
@@ -1,110 +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.model.nattable.nattableaxisprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;

-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.nattableaxisprovider.AbstractAxisProvider} object.

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

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

- * @generated

- */

-public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

-	public AbstractAxisProviderItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

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

-	}

-

-

-	/**

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

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

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

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

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;
+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.nattableaxisprovider.AbstractAxisProvider} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProviderItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		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$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 1ebaf214d90..ab93af0c918 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
@@ -1,196 +1,196 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.ecore.EStructuralFeature;

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

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

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

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

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

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public AxisProviderItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This 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(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS);

-		}

-		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 = ((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$

-	}

-

-

-	/**

-	 * 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(AxisProvider.class)) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				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

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createAxisGroup()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisProviderItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This 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(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS);
+		}
+		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 = ((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$
+	}
+
+
+	/**
+	 * 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(AxisProvider.class)) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				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
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 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 07f282d615b..8926972d79e 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
@@ -1,185 +1,185 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.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.nattableaxisprovider.MasterObjectAxisProvider;

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperFactory;

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addDisconnectSlavePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

-	 * 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(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES);

-		}

-		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 MasterObjectAxisProvider.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(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__SOURCES:

-				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

-				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,

-				 NattablewrapperFactory.eINSTANCE.createEObjectWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,

-				 NattablewrapperFactory.eINSTANCE.createIdWrapper()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.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.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperFactory;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MasterObjectAxisProviderItemProvider(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);
+
+			addDisconnectSlavePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES);
+		}
+		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 MasterObjectAxisProvider.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/MasterObjectAxisProvider")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(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__SOURCES:
+				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
+				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,
+				 NattablewrapperFactory.eINSTANCE.createEObjectWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,
+				 NattablewrapperFactory.eINSTANCE.createIdWrapper()));
+	}
+
+}
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 c4dde09fcdc..4b539638c2e 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
@@ -1,237 +1,237 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

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

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

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util.NattableaxisproviderAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

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

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 * @generated

-	 */

-	public NattableaxisproviderItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createSlaveObjectAxisProviderAdapter() {

-		if (slaveObjectAxisProviderItemProvider == null) {

-			slaveObjectAxisProviderItemProvider = new SlaveObjectAxisProviderItemProvider(this);

-		}

-

-		return slaveObjectAxisProviderItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createMasterObjectAxisProviderAdapter() {

-		if (masterObjectAxisProviderItemProvider == null) {

-			masterObjectAxisProviderItemProvider = new MasterObjectAxisProviderItemProvider(this);

-		}

-

-		return masterObjectAxisProviderItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util.NattableaxisproviderAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createSlaveObjectAxisProviderAdapter() {
+		if (slaveObjectAxisProviderItemProvider == null) {
+			slaveObjectAxisProviderItemProvider = new SlaveObjectAxisProviderItemProvider(this);
+		}
+
+		return slaveObjectAxisProviderItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createMasterObjectAxisProviderAdapter() {
+		if (masterObjectAxisProviderItemProvider == null) {
+			masterObjectAxisProviderItemProvider = new MasterObjectAxisProviderItemProvider(this);
+		}
+
+		return masterObjectAxisProviderItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+}
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 ce486c1ed4b..1555017230d 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
@@ -1,107 +1,107 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.IItemPropertyDescriptor;

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

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

-	public SlaveObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns SlaveObjectAxisProvider.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

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

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SlaveObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns SlaveObjectAxisProvider.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SlaveObjectAxisProvider")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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/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 174dbf6e057..a3b24d79aad 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
@@ -1,216 +1,216 @@
-/**

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

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

-import org.eclipse.emf.ecore.EStructuralFeature;

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

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-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.nattablecell.Cell} object.

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

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

- * @generated

- */

-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) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This 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(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER);

-			childrenFeatures.add(NattablecellPackage.Literals.CELL__ROW_WRAPPER);

-			childrenFeatures.add(NattablecellPackage.Literals.CELL__PROBLEMS);

-		}

-		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 Cell.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Cell")); //$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) {

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

-	}

-

-

-	/**

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

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

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

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

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

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

-		}

-		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

-				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__PROBLEMS,

-				 NattableproblemFactory.eINSTANCE.createProblem()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__PROBLEMS,

-				 NattableproblemFactory.eINSTANCE.createStringResolutionProblem()));

-	}

-

-	/**

-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

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

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

-	 * @generated

-	 */

-	@Override

-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {

-		Object childFeature = feature;

-		Object childObject = child;

-

-		boolean qualify =

-			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 super.getCreateChildText(owner, feature, child, selection);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.nattablecell.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+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.nattablecell.Cell} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This 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(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER);
+			childrenFeatures.add(NattablecellPackage.Literals.CELL__ROW_WRAPPER);
+			childrenFeatures.add(NattablecellPackage.Literals.CELL__PROBLEMS);
+		}
+		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 Cell.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Cell")); //$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) {
+		return getString("_UI_Cell_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		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;
+		}
+		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
+				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__PROBLEMS,
+				 NattableproblemFactory.eINSTANCE.createProblem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__PROBLEMS,
+				 NattableproblemFactory.eINSTANCE.createStringResolutionProblem()));
+	}
+
+	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		Object childObject = child;
+
+		boolean qualify =
+			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 super.getCreateChildText(owner, feature, child, selection);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 8dc6d846f6f..00fb8d41cb4 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
@@ -1,142 +1,142 @@
-/**

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

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-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.nattablecell.EObjectAxisWrapper} object.

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

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

- * @generated

- */

-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) {

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

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectAxisWrapper")); //$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) {

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

-	}

-

-

-	/**

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

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

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

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

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.nattablecell.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.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+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.nattablecell.EObjectAxisWrapper} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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_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
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectAxisWrapper")); //$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) {
+		return getString("_UI_EObjectAxisWrapper_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 95aff16fd40..d7d7ba742d3 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
@@ -1,154 +1,154 @@
-/**

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

-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.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-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.nattablecell.IdAxisWrapper} object.

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

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

- * @generated

- */

-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) {

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

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * 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(IdAxisWrapper.class)) {

-			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-				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);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.nattablecell.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.provider.EModelElementItemProvider;
+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.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+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.nattablecell.IdAxisWrapper} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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_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
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IdAxisWrapper")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(IdAxisWrapper.class)) {
+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
+				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);
+	}
+
+	/**
+	 * 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/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 b8577392e58..b938283ed50 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
@@ -1,261 +1,261 @@
-/**

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

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

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

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

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util.NattablecellAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

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

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 * @generated

-	 */

-	public NattablecellItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createCellAdapter() {

-		if (cellItemProvider == null) {

-			cellItemProvider = new CellItemProvider(this);

-		}

-

-		return cellItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectAxisWrapperAdapter() {

-		if (eObjectAxisWrapperItemProvider == null) {

-			eObjectAxisWrapperItemProvider = new EObjectAxisWrapperItemProvider(this);

-		}

-

-		return eObjectAxisWrapperItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createIdAxisWrapperAdapter() {

-		if (idAxisWrapperItemProvider == null) {

-			idAxisWrapperItemProvider = new IdAxisWrapperItemProvider(this);

-		}

-

-		return idAxisWrapperItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-}

+/**
+ * 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.nattablecell.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util.NattablecellAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCellAdapter() {
+		if (cellItemProvider == null) {
+			cellItemProvider = new CellItemProvider(this);
+		}
+
+		return cellItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectAxisWrapperAdapter() {
+		if (eObjectAxisWrapperItemProvider == null) {
+			eObjectAxisWrapperItemProvider = new EObjectAxisWrapperItemProvider(this);
+		}
+
+		return eObjectAxisWrapperItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIdAxisWrapperAdapter() {
+		if (idAxisWrapperItemProvider == null) {
+			idAxisWrapperItemProvider = new IdAxisWrapperItemProvider(this);
+		}
+
+		return idAxisWrapperItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+}
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 621cec77e1b..3272d9e62ec 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
@@ -1,213 +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.nattableconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

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

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

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

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

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 * @generated

-	 */

-	public NattableconfigurationItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableConfigurationAdapter() {

-		if (tableConfigurationItemProvider == null) {

-			tableConfigurationItemProvider = new TableConfigurationItemProvider(this);

-		}

-

-		return tableConfigurationItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableConfigurationAdapter() {
+		if (tableConfigurationItemProvider == null) {
+			tableConfigurationItemProvider = new TableConfigurationItemProvider(this);
+		}
+
+		return tableConfigurationItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+}
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 7e58e904661..24f71399911 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
@@ -1,347 +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.nattableconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

-import org.eclipse.emf.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.nattableaxisconfiguration.NattableaxisconfigurationFactory;

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorFactory;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addTypePropertyDescriptor(object);

-			addIconPathPropertyDescriptor(object);

-			addCellEditorDeclarationPropertyDescriptor(object);

-			addDefaultRowAxisProviderPropertyDescriptor(object);

-			addDefaultColumnAxisProviderPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * 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(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER);

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

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

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

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

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

-		}

-		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 TableConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

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

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				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

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER,

-				 NattabletesterFactory.eINSTANCE.createJavaTableTester()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION,

-				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION,

-				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS,

-				 NattablecelleditorFactory.eINSTANCE.createGenericRelationshipMatrixCellEditorConfiguration()));

-	}

-

-	/**

-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

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

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

-	 * @generated

-	 */

-	@Override

-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {

-		Object childFeature = feature;

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

-

-		if (qualify) {

-			return getString

-				("_UI_CreateChild_text2", //$NON-NLS-1$

-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

-		}

-		return super.getCreateChildText(owner, feature, child, selection);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.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.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableConfigurationItemProvider(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);
+
+			addTypePropertyDescriptor(object);
+			addIconPathPropertyDescriptor(object);
+			addCellEditorDeclarationPropertyDescriptor(object);
+			addDefaultRowAxisProviderPropertyDescriptor(object);
+			addDefaultColumnAxisProviderPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS);
+		}
+		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 TableConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableConfiguration")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(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:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				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
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER,
+				 NattabletesterFactory.eINSTANCE.createJavaTableTester()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION,
+				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION,
+				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS,
+				 NattablecelleditorFactory.eINSTANCE.createGenericRelationshipMatrixCellEditorConfiguration()));
+	}
+
+	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		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;
+
+		if (qualify) {
+			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 932f89f85f2..36baba759b1 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
@@ -1,167 +1,167 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

-import org.eclipse.emf.edit.provider.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.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-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.nattableconfiguration.TableNamedElement} object.

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

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

- * @generated

- */

-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) {

-		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);

-

-			addDescriptionPropertyDescriptor(object);

-			addNamePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * 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();

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

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

-			getString("_UI_TableNamedElement_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(TableNamedElement.class)) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__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);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.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.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+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.nattableconfiguration.TableNamedElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+
+			addDescriptionPropertyDescriptor(object);
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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();
+		return label == null || label.length() == 0 ?
+			getString("_UI_TableNamedElement_type") : //$NON-NLS-1$
+			getString("_UI_TableNamedElement_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(TableNamedElement.class)) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__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);
+	}
+
+	/**
+	 * 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/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 0d142edb267..8fab7e43a10 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
@@ -1,210 +1,210 @@
-/**

- * 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.FeatureLabelProviderConfiguration;

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

-

-/**

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

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addDisplayIsDerivedPropertyDescriptor(object);

-			addDisplayTypePropertyDescriptor(object);

-			addDisplayMultiplicityPropertyDescriptor(object);

-			addDisplayNamePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * This returns FeatureLabelProviderConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureLabelProviderConfiguration")); //$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) {

-		FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)object;

-		return getString("_UI_FeatureLabelProviderConfiguration_type") + " " + featureLabelProviderConfiguration.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(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;

-		}

-		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);

-	}

-

-}

+/**
+ * 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.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureLabelProviderConfigurationItemProvider(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);
+
+			addDisplayIsDerivedPropertyDescriptor(object);
+			addDisplayTypePropertyDescriptor(object);
+			addDisplayMultiplicityPropertyDescriptor(object);
+			addDisplayNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns FeatureLabelProviderConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureLabelProviderConfiguration")); //$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) {
+		FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)object;
+		return getString("_UI_FeatureLabelProviderConfiguration_type") + " " + featureLabelProviderConfiguration.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(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;
+		}
+		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/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 4e30597dad5..b27e6b05efc 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
@@ -1,261 +1,261 @@
-/**

- * 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.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

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

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

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util.NattablelabelproviderAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

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

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 * @generated

-	 */

-	public NattablelabelproviderItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createFeatureLabelProviderConfigurationAdapter() {

-		if (featureLabelProviderConfigurationItemProvider == null) {

-			featureLabelProviderConfigurationItemProvider = new FeatureLabelProviderConfigurationItemProvider(this);

-		}

-

-		return featureLabelProviderConfigurationItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createObjectLabelProviderConfigurationAdapter() {

-		if (objectLabelProviderConfigurationItemProvider == null) {

-			objectLabelProviderConfigurationItemProvider = new ObjectLabelProviderConfigurationItemProvider(this);

-		}

-

-		return objectLabelProviderConfigurationItemProvider;

-	}

-

-	/**

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

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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 (operationLabelProviderConfigurationItemProvider != null) operationLabelProviderConfigurationItemProvider.dispose();

-	}

-

-}

+/**
+ * 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.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util.NattablelabelproviderAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFeatureLabelProviderConfigurationAdapter() {
+		if (featureLabelProviderConfigurationItemProvider == null) {
+			featureLabelProviderConfigurationItemProvider = new FeatureLabelProviderConfigurationItemProvider(this);
+		}
+
+		return featureLabelProviderConfigurationItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createObjectLabelProviderConfigurationAdapter() {
+		if (objectLabelProviderConfigurationItemProvider == null) {
+			objectLabelProviderConfigurationItemProvider = new ObjectLabelProviderConfigurationItemProvider(this);
+		}
+
+		return objectLabelProviderConfigurationItemProvider;
+	}
+
+	/**
+	 * 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
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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 (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 be2aecf683b..9605858d170 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
@@ -1,176 +1,176 @@
-/**

- * 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.common.util.ResourceLocator;

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

-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.nattablelabelprovider.ObjectLabelProviderConfiguration} object.

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

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

- * @generated

- */

-public class ObjectLabelProviderConfigurationItemProvider extends StyledElementItemProvider {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addDisplayIconPropertyDescriptor(object);

-			addDisplayLabelPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

-	}

-

-	/**

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

-	}

-

-	/**

-	 * This returns ObjectLabelProviderConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectLabelProviderConfiguration")); //$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) {

-		ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)object;

-		return getString("_UI_ObjectLabelProviderConfiguration_type") + " " + objectLabelProviderConfiguration.isDisplayIcon(); //$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(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;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.common.util.ResourceLocator;
+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.ObjectLabelProviderConfiguration;
+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.nattablelabelprovider.ObjectLabelProviderConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ObjectLabelProviderConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectLabelProviderConfigurationItemProvider(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);
+
+			addDisplayIconPropertyDescriptor(object);
+			addDisplayLabelPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns ObjectLabelProviderConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectLabelProviderConfiguration")); //$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) {
+		ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)object;
+		return getString("_UI_ObjectLabelProviderConfiguration_type") + " " + objectLabelProviderConfiguration.isDisplayIcon(); //$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(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;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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
index e70ed33cdbd..681af77d095 100644
--- 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
@@ -1,188 +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);

-	}

-

-}

+/**
+ * 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 37bec03116c..7c475f63b23 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
@@ -1,237 +1,237 @@
-/**

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

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

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

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

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util.NattableproblemAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

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

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 * @generated

-	 */

-	public NattableproblemItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createProblemAdapter() {

-		if (problemItemProvider == null) {

-			problemItemProvider = new ProblemItemProvider(this);

-		}

-

-		return problemItemProvider;

-	}

-

-	/**

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

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createStringResolutionProblemAdapter() {

-		if (stringResolutionProblemItemProvider == null) {

-			stringResolutionProblemItemProvider = new StringResolutionProblemItemProvider(this);

-		}

-

-		return stringResolutionProblemItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-}

+/**
+ * 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.nattableproblem.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util.NattableproblemAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createProblemAdapter() {
+		if (problemItemProvider == null) {
+			problemItemProvider = new ProblemItemProvider(this);
+		}
+
+		return problemItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStringResolutionProblemAdapter() {
+		if (stringResolutionProblemItemProvider == null) {
+			stringResolutionProblemItemProvider = new StringResolutionProblemItemProvider(this);
+		}
+
+		return stringResolutionProblemItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+}
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 5ac51cf83e5..a71a1047ca4 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
@@ -1,121 +1,121 @@
-/**

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

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-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.nattableproblem.Problem} object.

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

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

- * @generated

- */

-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) {

-		super(adapterFactory);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

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

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns Problem.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * 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.nattableproblem.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+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.nattableproblem.Problem} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns Problem.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Problem")); //$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 = ((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$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 1c36a0d322e..a7e810f5dd7 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
@@ -1,164 +1,164 @@
-/**

- * 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.nattableproblem.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.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-

-/**

- * 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 {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public StringResolutionProblemItemProvider(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);

-

-			addValueAsStringPropertyDescriptor(object);

-			addUnresolvedStringPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns StringResolutionProblem.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringResolutionProblem")); //$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 = ((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$

-	}

-

-

-	/**

-	 * 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(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;

-		}

-		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);

-	}

-

-}

+/**
+ * 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.nattableproblem.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.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StringResolutionProblemItemProvider(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);
+
+			addValueAsStringPropertyDescriptor(object);
+			addUnresolvedStringPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns StringResolutionProblem.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringResolutionProblem")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(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;
+		}
+		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/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 846008a60de..56ac4f2c6e5 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public BooleanListValueStyleItemProvider(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);

-

-			addBooleanListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns BooleanListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanListValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(BooleanListValueStyle.class)) {

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BooleanListValueStyleItemProvider(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);
+
+			addBooleanListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns BooleanListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanListValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(BooleanListValueStyle.class)) {
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+				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/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 d0cb8597f64..bde99fd64b7 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public BooleanValueStyleItemProvider(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);

-

-			addBooleanValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns BooleanValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(BooleanValueStyle.class)) {

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BooleanValueStyleItemProvider(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);
+
+			addBooleanValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns BooleanValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(BooleanValueStyle.class)) {
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+				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/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 97ac6152d80..6a8ee98f7eb 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
@@ -1,154 +1,154 @@
-/**

- * 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.nattablestyle.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.provider.EModelElementItemProvider;

-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.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-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.nattablestyle.CellTextStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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) {

-		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);

-

-			addAlignmentPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns CellTextStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CellTextStyle")); //$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) {

-		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$

-	}

-

-	/**

-	 * 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(CellTextStyle.class)) {

-			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-				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);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * 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.nattablestyle.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.provider.EModelElementItemProvider;
+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.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+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.nattablestyle.CellTextStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+
+			addAlignmentPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns CellTextStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CellTextStyle")); //$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) {
+		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$
+	}
+
+	/**
+	 * 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(CellTextStyle.class)) {
+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
+				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);
+	}
+
+	/**
+	 * 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/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 d05523f4975..25db8d1d0cf 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public DoubleListValueStyleItemProvider(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);

-

-			addDoubleListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns DoubleListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleListValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(DoubleListValueStyle.class)) {

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DoubleListValueStyleItemProvider(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);
+
+			addDoubleListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns DoubleListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleListValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(DoubleListValueStyle.class)) {
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+				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/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 00e40e98d71..2710698c721 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public DoubleValueStyleItemProvider(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);

-

-			addDoubleValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns DoubleValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(DoubleValueStyle.class)) {

-			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DoubleValueStyleItemProvider(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);
+
+			addDoubleValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns DoubleValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(DoubleValueStyle.class)) {
+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+				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/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 6f0a89d99fa..fd14a355807 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
@@ -1,296 +1,296 @@
-/**

- * 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.nattablestyle.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.provider.EModelElementItemProvider;

-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.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-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.nattablestyle.FontStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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) {

-		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);

-

-			addFontColorPropertyDescriptor(object);

-			addFontNamePropertyDescriptor(object);

-			addFontHeightPropertyDescriptor(object);

-			addBoldPropertyDescriptor(object);

-			addItalicPropertyDescriptor(object);

-			addUnderlinePropertyDescriptor(object);

-			addStrikeThroughPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns FontStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FontStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(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;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * 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.nattablestyle.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.provider.EModelElementItemProvider;
+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.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+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.nattablestyle.FontStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+
+			addFontColorPropertyDescriptor(object);
+			addFontNamePropertyDescriptor(object);
+			addFontHeightPropertyDescriptor(object);
+			addBoldPropertyDescriptor(object);
+			addItalicPropertyDescriptor(object);
+			addUnderlinePropertyDescriptor(object);
+			addStrikeThroughPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns FontStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FontStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(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;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+}
diff --git a/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 c4401da160c..062a78c9287 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IntListValueStyleItemProvider(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);

-

-			addIntListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns IntListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntListValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(IntListValueStyle.class)) {

-			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IntListValueStyleItemProvider(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);
+
+			addIntListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns IntListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntListValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(IntListValueStyle.class)) {
+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+				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/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 d6584d60edf..ada951874f4 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IntValueStyleItemProvider(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);

-

-			addIntValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns IntValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(IntValueStyle.class)) {

-			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IntValueStyleItemProvider(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);
+
+			addIntValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns IntValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(IntValueStyle.class)) {
+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
+				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/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 caa93d74e03..f4a052b2ee1 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
@@ -1,152 +1,152 @@
-/**

- * 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.nattablestyle.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.provider.EModelElementItemProvider;

-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.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-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.nattablestyle.NamedStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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) {

-		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);

-

-			addNamePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_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

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NamedStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(NamedStyle.class)) {

-			case NattablestylePackage.NAMED_STYLE__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);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * 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.nattablestyle.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.provider.EModelElementItemProvider;
+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.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+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.nattablestyle.NamedStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_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
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/NamedStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(NamedStyle.class)) {
+			case NattablestylePackage.NAMED_STYLE__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);
+	}
+
+	/**
+	 * 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/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 464a24984ab..c4cd7f7b382 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
@@ -1,525 +1,525 @@
-/**

- * 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.nattablestyle.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util.NattablestyleAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * 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 {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createNamedStyleAdapter() {

-		if (namedStyleItemProvider == null) {

-			namedStyleItemProvider = new NamedStyleItemProvider(this);

-		}

-

-		return namedStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createFontStyleAdapter() {

-		if (fontStyleItemProvider == null) {

-			fontStyleItemProvider = new FontStyleItemProvider(this);

-		}

-

-		return fontStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createCellTextStyleAdapter() {

-		if (cellTextStyleItemProvider == null) {

-			cellTextStyleItemProvider = new CellTextStyleItemProvider(this);

-		}

-

-		return cellTextStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIntValueStyleAdapter() {

-		if (intValueStyleItemProvider == null) {

-			intValueStyleItemProvider = new IntValueStyleItemProvider(this);

-		}

-

-		return intValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIntListValueStyleAdapter() {

-		if (intListValueStyleItemProvider == null) {

-			intListValueStyleItemProvider = new IntListValueStyleItemProvider(this);

-		}

-

-		return intListValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createBooleanValueStyleAdapter() {

-		if (booleanValueStyleItemProvider == null) {

-			booleanValueStyleItemProvider = new BooleanValueStyleItemProvider(this);

-		}

-

-		return booleanValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createBooleanListValueStyleAdapter() {

-		if (booleanListValueStyleItemProvider == null) {

-			booleanListValueStyleItemProvider = new BooleanListValueStyleItemProvider(this);

-		}

-

-		return booleanListValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createDoubleValueStyleAdapter() {

-		if (doubleValueStyleItemProvider == null) {

-			doubleValueStyleItemProvider = new DoubleValueStyleItemProvider(this);

-		}

-

-		return doubleValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createDoubleListValueStyleAdapter() {

-		if (doubleListValueStyleItemProvider == null) {

-			doubleListValueStyleItemProvider = new DoubleListValueStyleItemProvider(this);

-		}

-

-		return doubleListValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createStringValueStyleAdapter() {

-		if (stringValueStyleItemProvider == null) {

-			stringValueStyleItemProvider = new StringValueStyleItemProvider(this);

-		}

-

-		return stringValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createStringListValueStyleAdapter() {

-		if (stringListValueStyleItemProvider == null) {

-			stringListValueStyleItemProvider = new StringListValueStyleItemProvider(this);

-		}

-

-		return stringListValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableDisplayStyleAdapter() {

-		if (tableDisplayStyleItemProvider == null) {

-			tableDisplayStyleItemProvider = new TableDisplayStyleItemProvider(this);

-		}

-

-		return tableDisplayStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectValueStyleAdapter() {

-		if (eObjectValueStyleItemProvider == null) {

-			eObjectValueStyleItemProvider = new EObjectValueStyleItemProvider(this);

-		}

-

-		return eObjectValueStyleItemProvider;

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectListValueStyleAdapter() {

-		if (eObjectListValueStyleItemProvider == null) {

-			eObjectListValueStyleItemProvider = new EObjectListValueStyleItemProvider(this);

-		}

-

-		return eObjectListValueStyleItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-}

+/**
+ * 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.nattablestyle.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util.NattablestyleAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createNamedStyleAdapter() {
+		if (namedStyleItemProvider == null) {
+			namedStyleItemProvider = new NamedStyleItemProvider(this);
+		}
+
+		return namedStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFontStyleAdapter() {
+		if (fontStyleItemProvider == null) {
+			fontStyleItemProvider = new FontStyleItemProvider(this);
+		}
+
+		return fontStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCellTextStyleAdapter() {
+		if (cellTextStyleItemProvider == null) {
+			cellTextStyleItemProvider = new CellTextStyleItemProvider(this);
+		}
+
+		return cellTextStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIntValueStyleAdapter() {
+		if (intValueStyleItemProvider == null) {
+			intValueStyleItemProvider = new IntValueStyleItemProvider(this);
+		}
+
+		return intValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIntListValueStyleAdapter() {
+		if (intListValueStyleItemProvider == null) {
+			intListValueStyleItemProvider = new IntListValueStyleItemProvider(this);
+		}
+
+		return intListValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createBooleanValueStyleAdapter() {
+		if (booleanValueStyleItemProvider == null) {
+			booleanValueStyleItemProvider = new BooleanValueStyleItemProvider(this);
+		}
+
+		return booleanValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createBooleanListValueStyleAdapter() {
+		if (booleanListValueStyleItemProvider == null) {
+			booleanListValueStyleItemProvider = new BooleanListValueStyleItemProvider(this);
+		}
+
+		return booleanListValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createDoubleValueStyleAdapter() {
+		if (doubleValueStyleItemProvider == null) {
+			doubleValueStyleItemProvider = new DoubleValueStyleItemProvider(this);
+		}
+
+		return doubleValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createDoubleListValueStyleAdapter() {
+		if (doubleListValueStyleItemProvider == null) {
+			doubleListValueStyleItemProvider = new DoubleListValueStyleItemProvider(this);
+		}
+
+		return doubleListValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStringValueStyleAdapter() {
+		if (stringValueStyleItemProvider == null) {
+			stringValueStyleItemProvider = new StringValueStyleItemProvider(this);
+		}
+
+		return stringValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStringListValueStyleAdapter() {
+		if (stringListValueStyleItemProvider == null) {
+			stringListValueStyleItemProvider = new StringListValueStyleItemProvider(this);
+		}
+
+		return stringListValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableDisplayStyleAdapter() {
+		if (tableDisplayStyleItemProvider == null) {
+			tableDisplayStyleItemProvider = new TableDisplayStyleItemProvider(this);
+		}
+
+		return tableDisplayStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectValueStyleAdapter() {
+		if (eObjectValueStyleItemProvider == null) {
+			eObjectValueStyleItemProvider = new EObjectValueStyleItemProvider(this);
+		}
+
+		return eObjectValueStyleItemProvider;
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectListValueStyleAdapter() {
+		if (eObjectListValueStyleItemProvider == null) {
+			eObjectListValueStyleItemProvider = new EObjectListValueStyleItemProvider(this);
+		}
+
+		return eObjectListValueStyleItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+}
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 544e4d5db2e..68fd082e20e 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public StringListValueStyleItemProvider(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);

-

-			addStringListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns StringListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringListValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(StringListValueStyle.class)) {

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StringListValueStyleItemProvider(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);
+
+			addStringListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns StringListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringListValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(StringListValueStyle.class)) {
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+				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/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 35f9a3a0bfd..22213894892 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
@@ -1,138 +1,138 @@
-/**

- * 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.nattablestyle.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.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-

-/**

- * 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 {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public StringValueStyleItemProvider(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);

-

-			addStringValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns StringValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringValueStyle")); //$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 = ((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$

-	}

-

-	/**

-	 * 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(StringValueStyle.class)) {

-			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-				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);

-	}

-}

+/**
+ * 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.nattablestyle.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.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+
+/**
+ * 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 {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StringValueStyleItemProvider(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);
+
+			addStringValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns StringValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringValueStyle")); //$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 = ((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$
+	}
+
+	/**
+	 * 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(StringValueStyle.class)) {
+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
+				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/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 0f9de3d8b63..54500263b4b 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
@@ -1,215 +1,215 @@
-/**

- * 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.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-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.nattablestyle.StyledElement} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This 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(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES);

-		}

-		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) {

-		return getString("_UI_StyledElement_type"); //$NON-NLS-1$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(StyledElement.class)) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				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

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createNamedStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createFontStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createCellTextStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createIntValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createIntListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createBooleanValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createBooleanListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createDoubleValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createDoubleListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createStringValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createStringListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createTableDisplayStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createEObjectValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createEObjectListValueStyle()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * 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.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+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.nattablestyle.StyledElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This 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(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES);
+		}
+		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) {
+		return getString("_UI_StyledElement_type"); //$NON-NLS-1$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(StyledElement.class)) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				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
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createNamedStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createFontStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createCellTextStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createIntValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createIntListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createBooleanValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createBooleanListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createDoubleValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createDoubleListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createStringValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createStringListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createTableDisplayStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createEObjectValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createEObjectListValueStyle()));
+	}
+
+	/**
+	 * 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/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 10ef82c8323..a37f77d2a0e 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
@@ -1,154 +1,154 @@
-/**

- * 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.nattablestyle.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.provider.EModelElementItemProvider;

-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.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-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.nattablestyle.TableDisplayStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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) {

-		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);

-

-			addDisplayStylePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * 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));

-	}

-

-	/**

-	 * This returns TableDisplayStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableDisplayStyle")); //$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) {

-		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$

-	}

-

-	/**

-	 * 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(TableDisplayStyle.class)) {

-			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-				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);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * 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.nattablestyle.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.provider.EModelElementItemProvider;
+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.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+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.nattablestyle.TableDisplayStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		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);
+
+			addDisplayStylePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * This returns TableDisplayStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableDisplayStyle")); //$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) {
+		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$
+	}
+
+	/**
+	 * 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(TableDisplayStyle.class)) {
+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
+				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);
+	}
+
+	/**
+	 * 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/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 50903f5438c..74280facbed 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
@@ -1,106 +1,106 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-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.nattabletester.AbstractTableTester} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_AbstractTableTester_type"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+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.nattabletester.AbstractTableTester} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_AbstractTableTester_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/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 cdd91977184..9e8cfe0f739 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
@@ -1,140 +1,140 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.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.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * 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 {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public JavaTableTesterItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addTesterPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Tester feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addTesterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_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

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JavaTableTester")); //$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 = ((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$

-	}

-

-

-	/**

-	 * 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(JavaTableTester.class)) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.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.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * 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 {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public JavaTableTesterItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addTesterPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Tester feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTesterPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_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
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/JavaTableTester")); //$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 = ((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$
+	}
+
+
+	/**
+	 * 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(JavaTableTester.class)) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/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 cba2f12654f..5dcec0b56e1 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
@@ -1,213 +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.nattabletester.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util.NattabletesterAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * 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 {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createJavaTableTesterAdapter() {

-		if (javaTableTesterItemProvider == null) {

-			javaTableTesterItemProvider = new JavaTableTesterItemProvider(this);

-		}

-

-		return javaTableTesterItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util.NattabletesterAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createJavaTableTesterAdapter() {
+		if (javaTableTesterItemProvider == null) {
+			javaTableTesterItemProvider = new JavaTableTesterItemProvider(this);
+		}
+
+		return javaTableTesterItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+}
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 c22492bfaed..7404a8606ee 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
@@ -1,105 +1,105 @@
-/**

- * 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.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;

-import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;

-

-/**

- * This is the central singleton for the Nattable edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableEditPlugin() {

-		super

-		  (new ResourceLocator [] {

-		     EcoreEditPlugin.INSTANCE,

-		     TypesConfigurationsEditPlugin.INSTANCE,

-		     ExpressionsEditPlugin.INSTANCE,

-		   });

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-}

+/**
+ * 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.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Nattable edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     EcoreEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		     ExpressionsEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+
+		/**
+		 * 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.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 ef9b3e80114..2b9c0bedfb5 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
@@ -1,213 +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.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * 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 {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * 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>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * 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;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableAdapter() {

-		if (tableItemProvider == null) {

-			tableItemProvider = new TableItemProvider(this);

-		}

-

-		return tableItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- 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))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-}

+/**
+ * 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.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * 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 {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * 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>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * 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;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableAdapter() {
+		if (tableItemProvider == null) {
+			tableItemProvider = new TableItemProvider(this);
+		}
+
+		return tableItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- 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))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.6

-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

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+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/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs
index 01d704bd380..954281dbc31 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs
@@ -1,68 +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>

+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/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
index de118b091ff..e25ed3d6ea7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
@@ -1,22 +1,22 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/,\

-           custom-src/

-output.. = bin

-src.includes = about.html

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/,\
+           custom-src/
+output.. = bin
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
index dfe25a474f7..d59f12cfe39 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableEditor extends NattableEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableEditor extends NattableEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
index a65b712a798..9ba3e440f82 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableaxisEditor extends NattableaxisEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableaxisEditor extends NattableaxisEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
index cbaefa6a1b5..72c92f99d9e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableaxisconfigurationEditor extends NattableaxisconfigurationEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableaxisconfigurationEditor extends NattableaxisconfigurationEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
index 5d596b0d1f8..fc3e8ea6395 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableaxisproviderEditor extends NattableaxisproviderEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableaxisproviderEditor extends NattableaxisproviderEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java
index 4ab3b41ed9d..1969a5d4201 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-public class CustomNattablecellEditor extends NattablecellEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+public class CustomNattablecellEditor extends NattablecellEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
index 24760807ba5..cf43fcdc5fb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableconfigurationEditor extends NattableconfigurationEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableconfigurationEditor extends NattableconfigurationEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
index 970703b49e6..d3f91a12983 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattablelabelproviderEditor extends NattablelabelproviderEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattablelabelproviderEditor extends NattablelabelproviderEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java
index aa33c002927..9a86e8c0119 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-public class CustomNattableproblemEditor extends NattableproblemEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+public class CustomNattableproblemEditor extends NattableproblemEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java
index ab8b81ae170..83d60f0cedf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-public class CustomNattablestyleEditor extends NattablestyleEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+public class CustomNattablestyleEditor extends NattablestyleEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
index 52b93603e85..2cdb7d83470 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattabletesterEditor extends NattabletesterEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// 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.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * 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.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattabletesterEditor extends NattabletesterEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// 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.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().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));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
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 51fed81996d..ddb291e0a0d 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
@@ -1,158 +1,163 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-pluginName = Nattable Editor

-providerName = Eclipse Modeling Project

-

-_UI_NattableEditor_menu = &Nattable Editor

-_UI_NattableconfigurationEditor_menu = &Nattableconfiguration Editor

-_UI_NattableaxisproviderEditor_menu = &Nattableaxisprovider Editor

-_UI_NattablelabelproviderEditor_menu = &Nattablelabelprovider Editor

-_UI_NattableaxisconfigurationEditor_menu = &Nattableaxisconfiguration Editor

-_UI_NattabletesterEditor_menu = &Nattabletester Editor

-_UI_NattableaxisEditor_menu = &Nattableaxis Editor

-_UI_NattablecellEditor_menu = &Nattablecell Editor

-_UI_NattableproblemEditor_menu = &Nattableproblem Editor

-_UI_NattablestyleEditor_menu = &Nattablestyle Editor

-

-_UI_CreateChild_menu_item = &New Child

-_UI_CreateSibling_menu_item = N&ew Sibling

-

-_UI_ShowPropertiesView_menu_item = Show &Properties View

-_UI_RefreshViewer_menu_item = &Refresh

-

-_UI_SelectionPage_label = Selection

-_UI_ParentPage_label = Parent

-_UI_ListPage_label = List

-_UI_TreePage_label = Tree

-_UI_TablePage_label = Table

-_UI_TreeWithColumnsPage_label = Tree with Columns

-_UI_ObjectColumn_label = Object

-_UI_SelfColumn_label = Self

-

-_UI_NoObjectSelected = Selected Nothing

-_UI_SingleObjectSelected = Selected Object: {0}

-_UI_MultiObjectSelected = Selected {0} Objects

-

-_UI_OpenEditorError_label = Open Editor

-

-_UI_Wizard_category = Table Creation Wizards

-

-_UI_CreateModelError_message = Problems encountered in file "{0}"

-

-_UI_NattableModelWizard_label = Nattable Model

-_UI_NattableModelWizard_description = Create a new Nattable model

-

-_UI_NattableEditor_label = Nattable Model Editor

-

-_UI_NattableEditorFilenameDefaultBase = My

-_UI_NattableEditorFilenameExtensions = nattable

-

-_UI_NattableconfigurationModelWizard_label = Nattableconfiguration Model

-_UI_NattableconfigurationModelWizard_description = Create a new Nattableconfiguration model

-

-_UI_NattableconfigurationEditor_label = Nattableconfiguration Model Editor

-

-_UI_NattableconfigurationEditorFilenameDefaultBase = My

-_UI_NattableconfigurationEditorFilenameExtensions = nattableconfiguration

-

-_UI_NattableaxisproviderModelWizard_label = Nattableaxisprovider Model

-_UI_NattableaxisproviderModelWizard_description = Create a new Nattableaxisprovider model

-

-_UI_NattableaxisproviderEditor_label = Nattableaxisprovider Model Editor

-

-_UI_NattableaxisproviderEditorFilenameDefaultBase = My

-_UI_NattableaxisproviderEditorFilenameExtensions = nattableaxisprovider

-

-_UI_NattablelabelproviderModelWizard_label = Nattablelabelprovider Model

-_UI_NattablelabelproviderModelWizard_description = Create a new Nattablelabelprovider model

-

-_UI_NattablelabelproviderEditor_label = Nattablelabelprovider Model Editor

-

-_UI_NattablelabelproviderEditorFilenameDefaultBase = My

-_UI_NattablelabelproviderEditorFilenameExtensions = nattablelabelprovider

-

-_UI_NattableaxisconfigurationModelWizard_label = Nattableaxisconfiguration Model

-_UI_NattableaxisconfigurationModelWizard_description = Create a new Nattableaxisconfiguration model

-

-_UI_NattableaxisconfigurationEditor_label = Nattableaxisconfiguration Model Editor

-

-_UI_NattableaxisconfigurationEditorFilenameDefaultBase = My

-_UI_NattableaxisconfigurationEditorFilenameExtensions = nattableaxisconfiguration

-

-_UI_NattabletesterModelWizard_label = Nattabletester Model

-_UI_NattabletesterModelWizard_description = Create a new Nattabletester model

-

-_UI_NattabletesterEditor_label = Nattabletester Model Editor

-

-_UI_NattabletesterEditorFilenameDefaultBase = My

-_UI_NattabletesterEditorFilenameExtensions = nattabletester

-

-_UI_NattableaxisModelWizard_label = Nattableaxis Model

-_UI_NattableaxisModelWizard_description = Create a new Nattableaxis model

-

-_UI_NattableaxisEditor_label = Nattableaxis Model Editor

-

-_UI_NattableaxisEditorFilenameDefaultBase = My

-_UI_NattableaxisEditorFilenameExtensions = nattableaxis

-

-_UI_NattablecellModelWizard_label = Nattablecell Model

-_UI_NattablecellModelWizard_description = Create a new Nattablecell model

-

-_UI_NattablecellEditor_label = Nattablecell Model Editor

-

-_UI_NattablecellEditorFilenameDefaultBase = My

-_UI_NattablecellEditorFilenameExtensions = nattablecell

-

-_UI_NattableproblemModelWizard_label = Nattableproblem Model

-_UI_NattableproblemModelWizard_description = Create a new Nattableproblem model

-

-_UI_NattableproblemEditor_label = Nattableproblem Model Editor

-

-_UI_NattableproblemEditorFilenameDefaultBase = My

-_UI_NattableproblemEditorFilenameExtensions = nattableproblem

-

-_UI_NattablestyleModelWizard_label = Nattablestyle Model

-_UI_NattablestyleModelWizard_description = Create a new Nattablestyle model

-

-_UI_NattablestyleEditor_label = Nattablestyle Model Editor

-

-_UI_NattablestyleEditorFilenameDefaultBase = My

-_UI_NattablestyleEditorFilenameExtensions = nattablestyle

-

-_UI_Wizard_label = New

-

-_WARN_FilenameExtension = The file name must end in ''.{0}''

-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}

-

-_UI_ModelObject = &Model Object

-_UI_XMLEncoding = &XML Encoding

-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1

-_UI_Wizard_initial_object_description = Select a model object to create

-

-_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.

-_UI_NattablecelleditorEditor_menu = &Nattablecelleditor Editor

-_UI_NattablewrapperEditor_menu = &Nattablewrapper Editor

-
_UI_NattablecelleditorModelWizard_label = Nattablecelleditor Model

-_UI_NattablecelleditorModelWizard_description = Create a new Nattablecelleditor model

-
_UI_NattablecelleditorEditor_label = Nattablecelleditor Model Editor

-
_UI_NattablecelleditorEditorFilenameDefaultBase = My

-_UI_NattablecelleditorEditorFilenameExtensions = nattablecelleditor

-
_UI_NattablewrapperModelWizard_label = Nattablewrapper Model

-_UI_NattablewrapperModelWizard_description = Create a new Nattablewrapper model

-
_UI_NattablewrapperEditor_label = Nattablewrapper Model Editor

-
_UI_NattablewrapperEditorFilenameDefaultBase = My

-_UI_NattablewrapperEditorFilenameExtensions = nattablewrapper

-
\ No newline at end of file
+#################################################################################
+# Copyright (c) 2013 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+##################################################################################
+
+pluginName = Nattable Editor
+providerName = Eclipse Modeling Project
+
+_UI_NattableEditor_menu = &Nattable Editor
+_UI_NattableconfigurationEditor_menu = &Nattableconfiguration Editor
+_UI_NattableaxisproviderEditor_menu = &Nattableaxisprovider Editor
+_UI_NattablelabelproviderEditor_menu = &Nattablelabelprovider Editor
+_UI_NattableaxisconfigurationEditor_menu = &Nattableaxisconfiguration Editor
+_UI_NattabletesterEditor_menu = &Nattabletester Editor
+_UI_NattableaxisEditor_menu = &Nattableaxis Editor
+_UI_NattablecellEditor_menu = &Nattablecell Editor
+_UI_NattableproblemEditor_menu = &Nattableproblem Editor
+_UI_NattablestyleEditor_menu = &Nattablestyle Editor
+
+_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
+_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
+_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
+_UI_OpenEditorError_label = Open Editor
+
+_UI_Wizard_category = Table Creation Wizards
+
+_UI_CreateModelError_message = Problems encountered in file "{0}"
+
+_UI_NattableModelWizard_label = Nattable Model
+_UI_NattableModelWizard_description = Create a new Nattable model
+
+_UI_NattableEditor_label = Nattable Model Editor
+
+_UI_NattableEditorFilenameDefaultBase = My
+_UI_NattableEditorFilenameExtensions = nattable
+
+_UI_NattableconfigurationModelWizard_label = Nattableconfiguration Model
+_UI_NattableconfigurationModelWizard_description = Create a new Nattableconfiguration model
+
+_UI_NattableconfigurationEditor_label = Nattableconfiguration Model Editor
+
+_UI_NattableconfigurationEditorFilenameDefaultBase = My
+_UI_NattableconfigurationEditorFilenameExtensions = nattableconfiguration
+
+_UI_NattableaxisproviderModelWizard_label = Nattableaxisprovider Model
+_UI_NattableaxisproviderModelWizard_description = Create a new Nattableaxisprovider model
+
+_UI_NattableaxisproviderEditor_label = Nattableaxisprovider Model Editor
+
+_UI_NattableaxisproviderEditorFilenameDefaultBase = My
+_UI_NattableaxisproviderEditorFilenameExtensions = nattableaxisprovider
+
+_UI_NattablelabelproviderModelWizard_label = Nattablelabelprovider Model
+_UI_NattablelabelproviderModelWizard_description = Create a new Nattablelabelprovider model
+
+_UI_NattablelabelproviderEditor_label = Nattablelabelprovider Model Editor
+
+_UI_NattablelabelproviderEditorFilenameDefaultBase = My
+_UI_NattablelabelproviderEditorFilenameExtensions = nattablelabelprovider
+
+_UI_NattableaxisconfigurationModelWizard_label = Nattableaxisconfiguration Model
+_UI_NattableaxisconfigurationModelWizard_description = Create a new Nattableaxisconfiguration model
+
+_UI_NattableaxisconfigurationEditor_label = Nattableaxisconfiguration Model Editor
+
+_UI_NattableaxisconfigurationEditorFilenameDefaultBase = My
+_UI_NattableaxisconfigurationEditorFilenameExtensions = nattableaxisconfiguration
+
+_UI_NattabletesterModelWizard_label = Nattabletester Model
+_UI_NattabletesterModelWizard_description = Create a new Nattabletester model
+
+_UI_NattabletesterEditor_label = Nattabletester Model Editor
+
+_UI_NattabletesterEditorFilenameDefaultBase = My
+_UI_NattabletesterEditorFilenameExtensions = nattabletester
+
+_UI_NattableaxisModelWizard_label = Nattableaxis Model
+_UI_NattableaxisModelWizard_description = Create a new Nattableaxis model
+
+_UI_NattableaxisEditor_label = Nattableaxis Model Editor
+
+_UI_NattableaxisEditorFilenameDefaultBase = My
+_UI_NattableaxisEditorFilenameExtensions = nattableaxis
+
+_UI_NattablecellModelWizard_label = Nattablecell Model
+_UI_NattablecellModelWizard_description = Create a new Nattablecell model
+
+_UI_NattablecellEditor_label = Nattablecell Model Editor
+
+_UI_NattablecellEditorFilenameDefaultBase = My
+_UI_NattablecellEditorFilenameExtensions = nattablecell
+
+_UI_NattableproblemModelWizard_label = Nattableproblem Model
+_UI_NattableproblemModelWizard_description = Create a new Nattableproblem model
+
+_UI_NattableproblemEditor_label = Nattableproblem Model Editor
+
+_UI_NattableproblemEditorFilenameDefaultBase = My
+_UI_NattableproblemEditorFilenameExtensions = nattableproblem
+
+_UI_NattablestyleModelWizard_label = Nattablestyle Model
+_UI_NattablestyleModelWizard_description = Create a new Nattablestyle model
+
+_UI_NattablestyleEditor_label = Nattablestyle Model Editor
+
+_UI_NattablestyleEditorFilenameDefaultBase = My
+_UI_NattablestyleEditorFilenameExtensions = nattablestyle
+
+_UI_Wizard_label = New
+
+_WARN_FilenameExtension = The file name must end in ''.{0}''
+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+
+_UI_ModelObject = &Model Object
+_UI_XMLEncoding = &XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
+_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.
+_UI_NattablecelleditorEditor_menu = &Nattablecelleditor Editor
+_UI_NattablewrapperEditor_menu = &Nattablewrapper Editor
+
+_UI_NattablecelleditorModelWizard_label = Nattablecelleditor Model
+_UI_NattablecelleditorModelWizard_description = Create a new Nattablecelleditor model
+
+_UI_NattablecelleditorEditor_label = Nattablecelleditor Model Editor
+
+_UI_NattablecelleditorEditorFilenameDefaultBase = My
+_UI_NattablecelleditorEditorFilenameExtensions = nattablecelleditor
+
+_UI_NattablewrapperModelWizard_label = Nattablewrapper Model
+_UI_NattablewrapperModelWizard_description = Create a new Nattablewrapper model
+
+_UI_NattablewrapperEditor_label = Nattablewrapper Model Editor
+
+_UI_NattablewrapperEditorFilenameDefaultBase = My
+_UI_NattablewrapperEditorFilenameExtensions = nattablewrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
index 1a00e20a0aa..78711cfc57a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
@@ -1,317 +1,317 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2013 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

- 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

--->

-

-<plugin>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizardID"

-            name="%_UI_NattableModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableModelFile.gif">

-         <description>%_UI_NattableModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorID"

-            name="%_UI_NattableEditor_label"

-            icon="icons/full/obj16/NattableModelFile.gif"

-            extensions="nattable"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizardID"

-            name="%_UI_NattableconfigurationModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableconfigurationModelFile.gif">

-         <description>%_UI_NattableconfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditorID"

-            name="%_UI_NattableconfigurationEditor_label"

-            icon="icons/full/obj16/NattableconfigurationModelFile.gif"

-            extensions="nattableconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizardID"

-            name="%_UI_NattableaxisproviderModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableaxisproviderModelFile.gif">

-         <description>%_UI_NattableaxisproviderModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditorID"

-            name="%_UI_NattableaxisproviderEditor_label"

-            icon="icons/full/obj16/NattableaxisproviderModelFile.gif"

-            extensions="nattableaxisprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizardID"

-            name="%_UI_NattablelabelproviderModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablelabelproviderModelFile.gif">

-         <description>%_UI_NattablelabelproviderModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditorID"

-            name="%_UI_NattablelabelproviderEditor_label"

-            icon="icons/full/obj16/NattablelabelproviderModelFile.gif"

-            extensions="nattablelabelprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizardID"

-            name="%_UI_NattableaxisconfigurationModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif">

-         <description>%_UI_NattableaxisconfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditorID"

-            name="%_UI_NattableaxisconfigurationEditor_label"

-            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif"

-            extensions="nattableaxisconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizardID"

-            name="%_UI_NattabletesterModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattabletesterModelFile.gif">

-         <description>%_UI_NattabletesterModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditorID"

-            name="%_UI_NattabletesterEditor_label"

-            icon="icons/full/obj16/NattabletesterModelFile.gif"

-            extensions="nattabletester"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizardID"

-            name="%_UI_NattableaxisModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableaxisModelFile.gif">

-         <description>%_UI_NattableaxisModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditorID"

-            name="%_UI_NattableaxisEditor_label"

-            icon="icons/full/obj16/NattableaxisModelFile.gif"

-            extensions="nattableaxis"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizardID"

-            name="%_UI_NattablecellModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablecellModelFile.gif">

-         <description>%_UI_NattablecellModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditorID"

-            name="%_UI_NattablecellEditor_label"

-            icon="icons/full/obj16/NattablecellModelFile.gif"

-            extensions="nattablecell"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizardID"

-            name="%_UI_NattableproblemModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableproblemModelFile.gif">

-         <description>%_UI_NattableproblemModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditorID"

-            name="%_UI_NattableproblemEditor_label"

-            icon="icons/full/obj16/NattableproblemModelFile.gif"

-            extensions="nattableproblem"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizardID"

-            name="%_UI_NattablestyleModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablestyleModelFile.gif">

-         <description>%_UI_NattablestyleModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditorID"

-            name="%_UI_NattablestyleEditor_label"

-            icon="icons/full/obj16/NattablestyleModelFile.gif"

-            extensions="nattablestyle"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablestyleEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizardID"

-            name="%_UI_NattablecelleditorModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablecelleditorModelFile.gif">

-         <description>%_UI_NattablecelleditorModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditorID"

-            name="%_UI_NattablecelleditorEditor_label"

-            icon="icons/full/obj16/NattablecelleditorModelFile.gif"

-            extensions="nattablecelleditor"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizardID"

-            name="%_UI_NattablewrapperModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablewrapperModelFile.gif">

-         <description>%_UI_NattablewrapperModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditorID"

-            name="%_UI_NattablewrapperEditor_label"

-            icon="icons/full/obj16/NattablewrapperModelFile.gif"

-            extensions="nattablewrapper"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperActionBarContributor">

-      </editor>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+ 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizardID"
+            name="%_UI_NattableModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableModelFile.gif">
+         <description>%_UI_NattableModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorID"
+            name="%_UI_NattableEditor_label"
+            icon="icons/full/obj16/NattableModelFile.gif"
+            extensions="nattable"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizardID"
+            name="%_UI_NattableconfigurationModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableconfigurationModelFile.gif">
+         <description>%_UI_NattableconfigurationModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditorID"
+            name="%_UI_NattableconfigurationEditor_label"
+            icon="icons/full/obj16/NattableconfigurationModelFile.gif"
+            extensions="nattableconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizardID"
+            name="%_UI_NattableaxisproviderModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableaxisproviderModelFile.gif">
+         <description>%_UI_NattableaxisproviderModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditorID"
+            name="%_UI_NattableaxisproviderEditor_label"
+            icon="icons/full/obj16/NattableaxisproviderModelFile.gif"
+            extensions="nattableaxisprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizardID"
+            name="%_UI_NattablelabelproviderModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablelabelproviderModelFile.gif">
+         <description>%_UI_NattablelabelproviderModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditorID"
+            name="%_UI_NattablelabelproviderEditor_label"
+            icon="icons/full/obj16/NattablelabelproviderModelFile.gif"
+            extensions="nattablelabelprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizardID"
+            name="%_UI_NattableaxisconfigurationModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif">
+         <description>%_UI_NattableaxisconfigurationModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditorID"
+            name="%_UI_NattableaxisconfigurationEditor_label"
+            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif"
+            extensions="nattableaxisconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizardID"
+            name="%_UI_NattabletesterModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattabletesterModelFile.gif">
+         <description>%_UI_NattabletesterModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditorID"
+            name="%_UI_NattabletesterEditor_label"
+            icon="icons/full/obj16/NattabletesterModelFile.gif"
+            extensions="nattabletester"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizardID"
+            name="%_UI_NattableaxisModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableaxisModelFile.gif">
+         <description>%_UI_NattableaxisModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditorID"
+            name="%_UI_NattableaxisEditor_label"
+            icon="icons/full/obj16/NattableaxisModelFile.gif"
+            extensions="nattableaxis"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizardID"
+            name="%_UI_NattablecellModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablecellModelFile.gif">
+         <description>%_UI_NattablecellModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditorID"
+            name="%_UI_NattablecellEditor_label"
+            icon="icons/full/obj16/NattablecellModelFile.gif"
+            extensions="nattablecell"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizardID"
+            name="%_UI_NattableproblemModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableproblemModelFile.gif">
+         <description>%_UI_NattableproblemModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditorID"
+            name="%_UI_NattableproblemEditor_label"
+            icon="icons/full/obj16/NattableproblemModelFile.gif"
+            extensions="nattableproblem"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizardID"
+            name="%_UI_NattablestyleModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablestyleModelFile.gif">
+         <description>%_UI_NattablestyleModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditorID"
+            name="%_UI_NattablestyleEditor_label"
+            icon="icons/full/obj16/NattablestyleModelFile.gif"
+            extensions="nattablestyle"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablestyleEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizardID"
+            name="%_UI_NattablecelleditorModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablecelleditorModelFile.gif">
+         <description>%_UI_NattablecelleditorModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditorID"
+            name="%_UI_NattablecelleditorEditor_label"
+            icon="icons/full/obj16/NattablecelleditorModelFile.gif"
+            extensions="nattablecelleditor"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizardID"
+            name="%_UI_NattablewrapperModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablewrapperModelFile.gif">
+         <description>%_UI_NattablewrapperModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditorID"
+            name="%_UI_NattablewrapperEditor_label"
+            icon="icons/full/obj16/NattablewrapperModelFile.gif"
+            extensions="nattablewrapper"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperActionBarContributor">
+      </editor>
+   </extension>
+
+</plugin>
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 a27e93ff8e6..7dd46e406b1 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
@@ -1,432 +1,432 @@
-/**

- * 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.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableaxis model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableaxis-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableaxis-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * 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.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableaxis model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableaxis-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableaxis-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 b662adc8aaf..ae11a775a6b 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
@@ -1,1830 +1,1830 @@
-/**

- * 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.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableaxis model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableaxisEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableaxisEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * 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.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableaxis model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableaxisEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableaxisEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 67b3a326b1a..cc3fc0e8c44 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
@@ -1,616 +1,616 @@
-/**

- * 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.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-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.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisPackage nattableaxisPackage = NattableaxisPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisFactory nattableaxisFactory = nattableaxisPackage.getNattableaxisFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxis"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableaxisPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableaxisPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableaxisFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableaxisModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableaxisModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * 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.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+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.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisPackage nattableaxisPackage = NattableaxisPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisFactory nattableaxisFactory = nattableaxisPackage.getNattableaxisFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxis"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableaxisPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableaxisPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableaxisFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableaxisModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableaxisModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 ec5889db984..63acc3645c9 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
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableaxisconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableaxisconfiguration-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableaxisconfiguration-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableaxisconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableaxisconfiguration-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableaxisconfiguration-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 c7ba6eaec50..5cedb25baff 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
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableaxisconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableaxisconfigurationEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableaxisconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableaxisconfigurationEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 5db89bb0640..6b2b1069963 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
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationPackage nattableaxisconfigurationPackage = NattableaxisconfigurationPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationFactory nattableaxisconfigurationFactory = nattableaxisconfigurationPackage.getNattableaxisconfigurationFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisconfiguration"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableaxisconfigurationPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableaxisconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableaxisconfigurationFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisconfigurationModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableaxisconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableaxisconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationPackage nattableaxisconfigurationPackage = NattableaxisconfigurationPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationFactory nattableaxisconfigurationFactory = nattableaxisconfigurationPackage.getNattableaxisconfigurationFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisconfiguration"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableaxisconfigurationPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableaxisconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableaxisconfigurationFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisconfigurationModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableaxisconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableaxisconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 3abc882f698..f93832b4463 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
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableaxisprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableaxisprovider-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableaxisprovider-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableaxisprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableaxisprovider-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableaxisprovider-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 997be4ae4c1..d2288b09c9c 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
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableaxisprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableaxisproviderEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableaxisprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableaxisproviderEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 9de19f118a0..477e24fc2a1 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
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderPackage nattableaxisproviderPackage = NattableaxisproviderPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderFactory nattableaxisproviderFactory = nattableaxisproviderPackage.getNattableaxisproviderFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisprovider"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableaxisproviderPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableaxisproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableaxisproviderFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisproviderModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableaxisproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableaxisproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderPackage nattableaxisproviderPackage = NattableaxisproviderPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderFactory nattableaxisproviderFactory = nattableaxisproviderPackage.getNattableaxisproviderFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisprovider"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableaxisproviderPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableaxisproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableaxisproviderFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisproviderModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableaxisproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableaxisproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 e8e0a43ba27..8131d918a5f 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
@@ -1,432 +1,432 @@
-/**

- * 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.nattablecell.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattablecell model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattablecell-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattablecell-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablecellMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * 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.nattablecell.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattablecell model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattablecell-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattablecell-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablecellMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 5efbda1fcc3..cd7aff708f3 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
@@ -1,1830 +1,1830 @@
-/**

- * 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.nattablecell.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattablecell model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattablecellEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattablecellEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattablecellEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * 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.nattablecell.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattablecell model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattablecellEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattablecellEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattablecellEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 86d032afb4c..b68e2cd2a4a 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
@@ -1,616 +1,616 @@
-/**

- * 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.nattablecell.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellPackage nattablecellPackage = NattablecellPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellFactory nattablecellFactory = nattablecellPackage.getNattablecellFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablecell"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablecellPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablecellPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattablecellFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablecellModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablecellModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablecellModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattablecellModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattablecellModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * 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.nattablecell.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellPackage nattablecellPackage = NattablecellPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellFactory nattablecellFactory = nattablecellPackage.getNattablecellFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablecell"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablecellPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablecellPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattablecellFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablecellModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablecellModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablecellModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattablecellModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattablecellModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 7520989f192..7deffdf6df0 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
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableconfiguration-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableconfiguration-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableconfiguration-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableconfiguration-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 2f1269b2cb6..202d081b1a4 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
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableconfigurationEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableconfigurationEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 7582e3df289..35988554e30 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
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationPackage nattableconfigurationPackage = NattableconfigurationPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationFactory nattableconfigurationFactory = nattableconfigurationPackage.getNattableconfigurationFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableconfiguration"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableconfigurationPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableconfigurationFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableconfigurationModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationPackage nattableconfigurationPackage = NattableconfigurationPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationFactory nattableconfigurationFactory = nattableconfigurationPackage.getNattableconfigurationFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableconfiguration"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableconfigurationPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableconfigurationFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableconfigurationModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 282cbe60fa0..56ab5681c25 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
@@ -1,432 +1,432 @@
-/**

- * 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.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattablelabelprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattablelabelprovider-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattablelabelprovider-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * 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.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattablelabelprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattablelabelprovider-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattablelabelprovider-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 8c7ad8e2aa4..d2c81e51d03 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
@@ -1,1830 +1,1830 @@
-/**

- * 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.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattablelabelprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattablelabelproviderEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * 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.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattablelabelprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattablelabelproviderEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 294d3f5a823..9ff87515b64 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
@@ -1,616 +1,616 @@
-/**

- * 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.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-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.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderPackage nattablelabelproviderPackage = NattablelabelproviderPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderFactory nattablelabelproviderFactory = nattablelabelproviderPackage.getNattablelabelproviderFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablelabelprovider"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablelabelproviderPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablelabelproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattablelabelproviderFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablelabelproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablelabelproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablelabelproviderModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattablelabelproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattablelabelproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * 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.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+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.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderPackage nattablelabelproviderPackage = NattablelabelproviderPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderFactory nattablelabelproviderFactory = nattablelabelproviderPackage.getNattablelabelproviderFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablelabelprovider"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablelabelproviderPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablelabelproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattablelabelproviderFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablelabelproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablelabelproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablelabelproviderModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattablelabelproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattablelabelproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 d7dcac1123a..35b076b1061 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
@@ -1,432 +1,432 @@
-/**

- * 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.nattableproblem.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableproblem model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableproblem-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableproblem-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblemMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * 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.nattableproblem.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableproblem model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableproblem-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableproblem-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblemMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 7046464b422..44db5bc2f0c 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
@@ -1,1830 +1,1830 @@
-/**

- * 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.nattableproblem.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableproblem model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableproblemEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableproblemEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * 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.nattableproblem.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableproblem model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableproblemEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableproblemEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 1679e091236..a4cfb0079d7 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
@@ -1,616 +1,616 @@
-/**

- * 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.nattableproblem.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemPackage nattableproblemPackage = NattableproblemPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemFactory nattableproblemFactory = nattableproblemPackage.getNattableproblemFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableproblem"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableproblemPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableproblemPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableproblemFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableproblemModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableproblemModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableproblemModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableproblemModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableproblemModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * 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.nattableproblem.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemPackage nattableproblemPackage = NattableproblemPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemFactory nattableproblemFactory = nattableproblemPackage.getNattableproblemFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableproblem"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableproblemPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableproblemPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableproblemFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableproblemModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableproblemModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableproblemModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableproblemModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableproblemModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 6774fc1abaf..4fc28472867 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
@@ -1,432 +1,432 @@
-/**

- * 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.nattablestyle.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattablestyle model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattablestyle-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattablestyle-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyleMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * 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.nattablestyle.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattablestyle model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattablestyle-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattablestyle-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyleMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 3907d4d1325..1a114f17571 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
@@ -1,1830 +1,1830 @@
-/**

- * 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.nattablestyle.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattablestyle model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattablestyleEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattablestyleEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * 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.nattablestyle.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattablestyle model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattablestyleEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattablestyleEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 c1f00961dac..922fad87a2e 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
@@ -1,616 +1,616 @@
-/**

- * 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.nattablestyle.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestylePackage nattablestylePackage = NattablestylePackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestyleFactory nattablestyleFactory = nattablestylePackage.getNattablestyleFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestyleModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestyleModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablestyle"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablestylePackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablestylePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattablestyleFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablestyleModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablestyleModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablestyleModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattablestyleModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattablestyleModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * 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.nattablestyle.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestylePackage nattablestylePackage = NattablestylePackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestyleFactory nattablestyleFactory = nattablestylePackage.getNattablestyleFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestyleModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestyleModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablestyle"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablestylePackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablestylePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattablestyleFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablestyleModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablestyleModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablestyleModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattablestyleModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattablestyleModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 28ab49eac3f..395bd5b0a19 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
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattabletester model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattabletester-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattabletester-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattabletesterMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattabletester model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattabletester-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattabletester-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattabletesterMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 150aebee910..3199778f18a 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
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattabletester model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattabletesterEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattabletesterEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattabletester model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattabletesterEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattabletesterEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 e30bfed16b8..b26226b06a3 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
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterPackage nattabletesterPackage = NattabletesterPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterFactory nattabletesterFactory = nattabletesterPackage.getNattabletesterFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattabletester"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattabletesterPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattabletesterPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattabletesterFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattabletesterModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattabletesterModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattabletesterModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattabletesterModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattabletesterModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterPackage nattabletesterPackage = NattabletesterPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterFactory nattabletesterFactory = nattabletesterPackage.getNattabletesterFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattabletester"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattabletesterPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattabletesterPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattabletesterFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattabletesterModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattabletesterModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattabletesterModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattabletesterModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattabletesterModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.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 161cc9ae337..a65191b5643 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
@@ -1,431 +1,431 @@
-/**

- * 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.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.ui.IEditorPart;

-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

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattable-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattable-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattableMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * 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.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.ui.IEditorPart;
+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
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattable-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattable-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattableMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/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 2a644ffacbc..964ba41e431 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
@@ -1,1829 +1,1829 @@
-/**

- * 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.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattable model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * 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;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * 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;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * 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;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * 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>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * 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);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableEditor.this) {

-					handleActivate();

-				}

-			}

-			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>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * 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>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@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();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * 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);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					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();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * 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() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 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() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// 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();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		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);

-						}

-					}

-				};

-			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}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// 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());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * 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) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * 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(), 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) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				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 });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				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);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(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;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * 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);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// 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());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * 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();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * 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();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 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();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// 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.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						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));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * 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) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				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;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * 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 });

-	}

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * 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.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattable model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * 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;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * 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;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * 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;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * 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>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * 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);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableEditor.this) {
+					handleActivate();
+				}
+			}
+			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>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * 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>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@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();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * 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);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					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();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * 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() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 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() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// 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();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		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);
+						}
+					}
+				};
+			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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// 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());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * 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) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * 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(), 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) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				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 });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				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.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				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);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(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;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * 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);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// 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());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * 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();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * 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();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// 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.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						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));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * 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) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				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;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * 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 });
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
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 30b069954da..f38d64bb595 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
@@ -1,105 +1,105 @@
-/**

- * 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.presentation;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.ui.EclipseUIPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;

-import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;

-

-/**

- * This is the central singleton for the Nattable editor plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-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();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableEditorPlugin() {

-		super

-			(new ResourceLocator [] {

-				EcoreEditPlugin.INSTANCE,

-				TypesConfigurationsEditPlugin.INSTANCE,

-				ExpressionsEditPlugin.INSTANCE,

-			});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static class Implementation extends EclipseUIPlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-	

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

+/**
+ * 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.presentation;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Nattable editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+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();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableEditorPlugin() {
+		super
+			(new ResourceLocator [] {
+				EcoreEditPlugin.INSTANCE,
+				TypesConfigurationsEditPlugin.INSTANCE,
+				ExpressionsEditPlugin.INSTANCE,
+			});
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipseUIPlugin {
+		/**
+		 * 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 c68abe548de..9d73577772d 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
@@ -1,615 +1,615 @@
-/**

- * 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.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-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 {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablePackage nattablePackage = NattablePackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableFactory nattableFactory = nattablePackage.getNattableFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * 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;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattable"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablePackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// 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();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(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) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				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 }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * 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;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * 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) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- 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$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					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) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * 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.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+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 {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablePackage nattablePackage = NattablePackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableFactory nattableFactory = nattablePackage.getNattableFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * 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;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattable"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablePackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// 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();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(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) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				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 }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * 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;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * 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) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- 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$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					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) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath
index 486b1b8b096..c68522b5865 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath
@@ -1,8 +1,8 @@
-<?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.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
index d8b6b2c3f5d..025bbfda2ac 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
@@ -1,22 +1,22 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/,\

-           src/

-output.. = bin/

-src.includes = about.html

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
index 3342f7c106f..24a6bd5d269 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
@@ -1,1001 +1,1001 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_EfChwKHtEeKNUa7kbzEWsw" type="1005">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA4aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMSwKHtEeKNUa7kbzEWsw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMSwaHtEeKNUa7kbzEWsw" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_hJG1UqH0EeKNUa7kbzEWsw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/ALPHABETIC"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1U6H0EeKNUa7kbzEWsw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_hJG1UKH0EeKNUa7kbzEWsw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/NUMERIC"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1UaH0EeKNUa7kbzEWsw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSwqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSw6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSxKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfChwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfChwqHtEeKNUa7kbzEWsw" x="10" y="910"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMSxaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA46HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMSyKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMSyaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSyqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSy6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSzKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMSzaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSzqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSz6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS0KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMSxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMSx6HtEeKNUa7kbzEWsw" x="1010" y="1430" width="183"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMS3aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA5qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA56HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMS4KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMS4aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS4qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS46HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS5KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMS5aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS5qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS56HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS6KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS36HtEeKNUa7kbzEWsw" x="1400" y="1255"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMS6aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA6KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA6aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMS7KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMS7aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS7qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS76HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS8KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMS8aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS8qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS86HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS9KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS66HtEeKNUa7kbzEWsw" x="2085" y="590" width="298" height="143"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMTDaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA7qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA76HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMTEKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMTEaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTEqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTE6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTFKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMTFaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTFqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTF6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTGKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTDqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTD6HtEeKNUa7kbzEWsw" x="1890" y="160"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMTGaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA8aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMTHKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMTHaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTHqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTH6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTIKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMTIaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTIqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTI6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTJKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTGqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTG6HtEeKNUa7kbzEWsw" x="295" y="1255"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMTJaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA86HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVcsKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVcsaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcsqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcs6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVctKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVctaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVctqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVct6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcuKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTJ6HtEeKNUa7kbzEWsw" x="415" y="925"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVcuaHtEeKNUa7kbzEWsw" type="1005">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA9KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA9aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVcvKHtEeKNUa7kbzEWsw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVcvaHtEeKNUa7kbzEWsw" type="5008">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcvqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcv6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcwKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVcuqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableconfiguration/CellEditorDeclaration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcu6HtEeKNUa7kbzEWsw" x="15" y="750"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVczaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc0KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc0aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc0qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc06HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc1KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc1aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc1qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc16HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc2KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVczqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcz6HtEeKNUa7kbzEWsw" x="1315" y="395"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc2aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc3KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc3aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc3qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc36HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc4KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc4aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc4qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc46HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc5KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc26HtEeKNUa7kbzEWsw" x="1595" y="1595"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc5aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc6KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc6aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc6qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc66HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc7KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc7aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc7qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc76HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc8KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc5qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/JavaTableTester"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc56HtEeKNUa7kbzEWsw" x="2400" y="465"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc8aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc9KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc9aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc9qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc96HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc-KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc-aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc-qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc-6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc_KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc8qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc86HtEeKNUa7kbzEWsw" x="850" y="400" width="228" height="88"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc_aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBAaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVdAKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVdAaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdAqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdA6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdBKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVdBaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdBqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdB6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdCKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc_qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc_6HtEeKNUa7kbzEWsw" x="1605" y="1435"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVdCaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBA6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVdDKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVdDaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdDqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdD6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdEKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVdEaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdEqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdE6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdFKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdCqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdC6HtEeKNUa7kbzEWsw" x="1425" y="610"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVdLaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBCKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBCaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffNsKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffNsaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNsqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNs6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNtKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffNtaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNtqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNt6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNuKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdLqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdL6HtEeKNUa7kbzEWsw" x="80" y="355" height="93"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffNxaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBDKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBDaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffNyKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffNyaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNyqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNy6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNzKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffNzaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNzqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNz6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN0KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffNxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffNx6HtEeKNUa7kbzEWsw" x="1255" y="1595"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffN3aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBEaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffN4KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffN4aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN4qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN46HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN5KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffN5aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN5qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN56HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN6KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN36HtEeKNUa7kbzEWsw" x="1425" y="1595"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffN6aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBE6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffN7KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffN7aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN7qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN76HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN8KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffN8aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN8qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN86HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN9KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN66HtEeKNUa7kbzEWsw" x="1245" y="1435"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffN9aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBFaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffN-KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffN-aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN-qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN-6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN_KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffN_aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN_qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN_6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOAKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN9qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN96HtEeKNUa7kbzEWsw" x="1415" y="1435"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOAaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBF6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOBKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOBaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOBqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOB6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOCKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOCaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOCqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOC6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffODKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOAqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOA6HtEeKNUa7kbzEWsw" x="55" y="560"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffODaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBGKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBGaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOEKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOEaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOEqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOE6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOFKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOFaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOFqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOF6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOGKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffODqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/AbstractTableTester"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOD6HtEeKNUa7kbzEWsw" x="2415" y="300" width="208"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOJaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBHaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOKKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOKaHtEeKNUa7kbzEWsw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_hJZwTqH0EeKNUa7kbzEWsw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwT6H0EeKNUa7kbzEWsw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_hJZwTKH0EeKNUa7kbzEWsw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwTaH0EeKNUa7kbzEWsw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOKqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOK6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOLKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOLaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOLqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOL6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOMKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableNamedElement"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOJ6HtEeKNUa7kbzEWsw" x="2550" y="140"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOMaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBH6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffONKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffONaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffONqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffON6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOOKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOOaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOOqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOO6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOPKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOMqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOM6HtEeKNUa7kbzEWsw" x="1455" y="765"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOPaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBIKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBIaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOQKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOQaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOQqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOQ6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffORKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffORaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffORqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOR6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOSKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOPqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOP6HtEeKNUa7kbzEWsw" x="2585" y="565" height="187"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Ek_YwKHtEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Yw6HtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Ek_YxKHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YxaHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YxqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yx6HtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_YyKHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YyaHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YyqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yy6HtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Ek_YwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//Table"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek_YwqHtEeKNUa7kbzEWsw" x="2535" y="1080" height="146"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_rlVcQKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rlyIMKH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rlyIMaH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_rlVcQ6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_rlVcRKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcRaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcRqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcR6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_rlVcSKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcSaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcSqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcS6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_rlVcQaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rlVcQqH3EeKNUa7kbzEWsw" x="785" y="1080"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjigEKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4KH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB4aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjigE6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjigFKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigFaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigFqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigF6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjigGKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigGaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigGqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigG6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigEaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigEqH3EeKNUa7kbzEWsw" x="1510" y="1170"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjigHKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4qH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB46H3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjigH6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjigIKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigIaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigIqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigI6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjigJKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigJaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigJqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigJ6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigHaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigHqH3EeKNUa7kbzEWsw" x="1730" y="1170"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjrqDKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB6KH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB6aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjrqD6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjrqEKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqEaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqEqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqE6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjrqFKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqFaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqFqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqF6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqDaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqDqH3EeKNUa7kbzEWsw" x="1505" y="965"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjrqJKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB7KH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB7aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjrqJ6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjrqKKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqKaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqKqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqK6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjrqLKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqLaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqLqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqL6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqJaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqJqH3EeKNUa7kbzEWsw" x="1735" y="965"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_EghvgKHtEeKNUa7kbzEWsw" type="3003" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EghvgaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EghvgqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eghvg6HtEeKNUa7kbzEWsw" points="[4, 9, -119, -33]$[92, 9, -31, -33]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8EqHtEeKNUa7kbzEWsw" id="(0.9731543624161074,0.36666666666666664)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8E6HtEeKNUa7kbzEWsw" id="(0.2882882882882883,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrghKHtEeKNUa7kbzEWsw" type="3002" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgiKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgiaHtEeKNUa7kbzEWsw" x="8" y="53"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgiqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgi6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrghaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrghqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgh6HtEeKNUa7kbzEWsw" points="[4, 58, -32, -432]$[36, 490, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDaHtEeKNUa7kbzEWsw" id="(0.18633540372670807,0.9666666666666667)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDqHtEeKNUa7kbzEWsw" id="(0.22849462365591397,0.08602150537634409)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgjKHtEeKNUa7kbzEWsw" type="3003" source="_EffN9aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgj6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCaHtEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCqHtEeKNUa7kbzEWsw" id="(0.21739130434782608,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgkKHtEeKNUa7kbzEWsw" type="3003" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgkaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgkqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgk6HtEeKNUa7kbzEWsw" points="[0, 0, -112, 94]$[0, -30, -112, 64]$[112, -30, 0, 64]$[112, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BaHtEeKNUa7kbzEWsw" id="(0.10869565217391304,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrglKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrglaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrglqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgl6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FKHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FaHtEeKNUa7kbzEWsw" id="(0.7065217391304348,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgmKHtEeKNUa7kbzEWsw" type="3003" source="_EfMS6aHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgmaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgmqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgm6HtEeKNUa7kbzEWsw" points="[1, 0, -282, 442]$[1, -483, -282, -41]$[243, -483, -40, -41]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8CqHtEeKNUa7kbzEWsw" id="(0.7515527950310559,0.014705882352941176)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8C6HtEeKNUa7kbzEWsw" id="(0.2469879518072289,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgnKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgoKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgoaHtEeKNUa7kbzEWsw" x="-93" y="24"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgoqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgo6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgnaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgnqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnAxisProviders"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgn6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IKHtEeKNUa7kbzEWsw" id="(0.021052631578947368,0.29411764705882354)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IaHtEeKNUa7kbzEWsw" id="(0.9295302013422819,0.14685314685314685)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgpKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgqKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgqaHtEeKNUa7kbzEWsw" x="-93" y="15"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgqqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgq6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgpaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgpqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowAxisProviders"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgp6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FqHtEeKNUa7kbzEWsw" id="(0.017543859649122806,0.42780748663101603)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8F6HtEeKNUa7kbzEWsw" id="(0.9362416107382551,0.3776223776223776)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgrKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgsKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgsaHtEeKNUa7kbzEWsw" x="-56" y="-20"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgsqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgs6HtEeKNUa7kbzEWsw" x="23" y="-20"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgraHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgrqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultRowAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgr6HtEeKNUa7kbzEWsw" points="[-3, -19, 71, 510]$[-73, -523, 1, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8GqHtEeKNUa7kbzEWsw" id="(0.04912280701754386,0.7549019607843137)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8G6HtEeKNUa7kbzEWsw" id="(0.9832214765100671,0.7972027972027972)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgtKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrguKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrguaHtEeKNUa7kbzEWsw" x="-81" y="12"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrguqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgu6HtEeKNUa7kbzEWsw" x="7" y="12"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgtaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgtqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultColumnAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgt6HtEeKNUa7kbzEWsw" points="[0, -3, 27, 510]$[-27, -507, 0, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HKHtEeKNUa7kbzEWsw" id="(0.0,0.6203208556149733)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HaHtEeKNUa7kbzEWsw" id="(0.9563758389261745,0.6363636363636364)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg0qcKHtEeKNUa7kbzEWsw" type="3003" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qc6HtEeKNUa7kbzEWsw" points="[0, 0, 31, 155]$[0, -69, 31, 86]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGD6HtEeKNUa7kbzEWsw" id="(0.6645962732919255,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEKHtEeKNUa7kbzEWsw" id="(0.10067114093959731,0.3916083916083916)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg0qjKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTDaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qj6HtEeKNUa7kbzEWsw" points="[13, 8, 198, -412]$[13, 130, 198, -290]$[-161, 130, 24, -290]$[-161, 405, 24, -15]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGA6HtEeKNUa7kbzEWsw" id="(0.36180904522613067,0.8666666666666667)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGBKHtEeKNUa7kbzEWsw" id="(0.7115384615384616,0.13445378151260504)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bfKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTGaHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bfaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bfqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bf6HtEeKNUa7kbzEWsw" points="[-53, 0, -81, 264]$[-53, -288, -81, -24]$[9, -288, -19, -24]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF96HtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-KHtEeKNUa7kbzEWsw" id="(0.091324200913242,0.8)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bgKHtEeKNUa7kbzEWsw" type="3002" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMTGaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Eg-bhKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bhaHtEeKNUa7kbzEWsw" x="-12" y="-83"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Eg-bhqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bh6HtEeKNUa7kbzEWsw" x="-32" y="-37"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bgaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bgqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bg6HtEeKNUa7kbzEWsw" points="[-9, 58, 813, 121]$[-9, 95, 813, 158]$[-822, 95, 0, 158]$[-822, -63, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8B6HtEeKNUa7kbzEWsw" id="(0.8214285714285714,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bjKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Eg-bkKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bkaHtEeKNUa7kbzEWsw" x="84" y="84"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Eg-bkqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bk6HtEeKNUa7kbzEWsw" x="44" y="15"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bjaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bjqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bj6HtEeKNUa7kbzEWsw" points="[0, 0, 1127, 427]$[0, -45, 1127, 382]$[-1136, -45, -9, 382]$[-1136, -427, -9, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGaHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGqHtEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlYKHtEeKNUa7kbzEWsw" type="3002" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVc8aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EhHlZKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZaHtEeKNUa7kbzEWsw" x="-42" y="-89"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EhHlZqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZ6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlYaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlYqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlY6HtEeKNUa7kbzEWsw" points="[-12, 1, 286, -14]$[-261, 13, 37, -2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AKHtEeKNUa7kbzEWsw" id="(0.056768558951965066,0.8)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AaHtEeKNUa7kbzEWsw" id="(0.8947368421052632,0.5568181818181818)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlaKHtEeKNUa7kbzEWsw" type="3003" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlaaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlaqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHla6HtEeKNUa7kbzEWsw" points="[0, 0, -255, 239]$[0, -209, -255, 30]$[255, -209, 0, 30]$[255, -239, 0, 0]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHKHtEeKNUa7kbzEWsw" id="(0.3317307692307692,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlbKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc2aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlbaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlbqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlb6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9aHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9qHtEeKNUa7kbzEWsw" id="(0.4144144144144144,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlcKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc5aHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlc6HtEeKNUa7kbzEWsw" points="[0, 0, 254, 111]$[0, -30, 254, 81]$[-254, -30, 0, 81]$[-254, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAaHtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAqHtEeKNUa7kbzEWsw" id="(0.25,0.9264705882352942)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhRWeKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWeaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWeqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWe6HtEeKNUa7kbzEWsw" points="[0, 0, -120, 102]$[0, -30, -120, 72]$[120, -30, 0, 72]$[120, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGE6HtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFKHtEeKNUa7kbzEWsw" id="(0.2072072072072072,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhbHdKHtEeKNUa7kbzEWsw" type="3003" source="_EffOAaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHdaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHdqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHd6HtEeKNUa7kbzEWsw" points="[-3, 0, 19, 114]$[-3, -114, 19, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGB6HtEeKNUa7kbzEWsw" id="(0.2931726907630522,0.014705882352941176)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCKHtEeKNUa7kbzEWsw" id="(0.25,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRUKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRUaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRUqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRU6HtEeKNUa7kbzEWsw" points="[0, 0, -111, 94]$[0, -30, -111, 64]$[111, -30, 0, 64]$[111, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DaHtEeKNUa7kbzEWsw" id="(0.24806201550387597,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRVKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRVaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRVqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRV6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8D6HtEeKNUa7kbzEWsw" id="(0.5765765765765766,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRWKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRW6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEaHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEqHtEeKNUa7kbzEWsw" id="(0.49612403100775193,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhuCUKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EhuCVKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCVaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EhuCVqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCV6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCUaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCUqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/creationTester"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCU6HtEeKNUa7kbzEWsw" points="[0, 0, 89, 284]$[-89, -284, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IqHtEeKNUa7kbzEWsw" id="(0.05964912280701754,0.0427807486631016)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8I6HtEeKNUa7kbzEWsw" id="(0.8920454545454546,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhuCWKHtEeKNUa7kbzEWsw" type="3003" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCW6HtEeKNUa7kbzEWsw" points="[-169, 0, 1, 431]$[-169, -427, 1, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIaHtEeKNUa7kbzEWsw" id="(0.9403508771929825,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIqHtEeKNUa7kbzEWsw" id="(0.8012048192771084,0.9529411764705882)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_YzqHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOPaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y0qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y06HtEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y1KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y1aHtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Yz6HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y0KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y0aHtEeKNUa7kbzEWsw" points="[9, -10, 0, 336]$[9, -340, 0, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir5h8KHtEeKNUa7kbzEWsw" id="(0.8552631578947368,0.07534246575342465)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kbepMKHtEeKNUa7kbzEWsw" id="(0.3087719298245614,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y1qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y2qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y26HtEeKNUa7kbzEWsw" x="-335" y="102"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y3KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y3aHtEeKNUa7kbzEWsw" x="-325" y="20"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y16HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y2KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/columnAxisProvidersHistory"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y2aHtEeKNUa7kbzEWsw" points="[-146, 0, 271, 460]$[-411, 0, 6, 460]$[-411, -453, 6, 7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7tvZUKHuEeKNUa7kbzEWsw" id="(0.9736842105263158,0.726027397260274)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6fePYKHuEeKNUa7kbzEWsw" id="(0.6073825503355704,0.8970588235294118)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y3qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y4qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y46HtEeKNUa7kbzEWsw" x="-356" y="129"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y5KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y5aHtEeKNUa7kbzEWsw" x="-356" y="37"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y36HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y4KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/rowAxisProvidersHistory"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y4aHtEeKNUa7kbzEWsw" points="[-145, 0, 308, 485]$[-445, 0, 8, 485]$[-445, -480, 8, 5]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EDnkKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.910958904109589)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__1i8MKHuEeKNUa7kbzEWsw" id="(0.4798657718120805,0.9264705882352942)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ0KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_ElJJ1KHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ1aHtEeKNUa7kbzEWsw" x="-309" y="104"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ElJJ1qHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ16HtEeKNUa7kbzEWsw" x="-308" y="19"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ0aHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ0qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentRowAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ06HtEeKNUa7kbzEWsw" points="[-137, 0, 235, 423]$[-372, 0, 0, 423]$[-372, -420, 0, 3]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ETwEKHuEeKNUa7kbzEWsw" id="(0.9144736842105263,0.4931506849315068)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyW7AKH1EeKNUa7kbzEWsw" id="(0.7281879194630873,0.9558823529411765)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ2KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_ElJJ3KHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ3aHtEeKNUa7kbzEWsw" x="-235" y="120"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ElJJ3qHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ36HtEeKNUa7kbzEWsw" x="-230" y="31"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ2aHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentColumnAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ26HtEeKNUa7kbzEWsw" points="[-90, 0, 197, 386]$[-287, 0, 0, 386]$[-287, -384, 0, 2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0FtQ8KHuEeKNUa7kbzEWsw" id="(0.6052631578947368,0.2465753424657534)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXzXYKHuEeKNUa7kbzEWsw" id="(0.8557046979865772,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ4KHtEeKNUa7kbzEWsw" type="3003" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ4aHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ4qHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ46HtEeKNUa7kbzEWsw" points="[5, 40, -4, 1013]$[315, 40, 306, 1013]$[315, -931, 306, 42]$[34, -931, 25, 42]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdYFoKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.2328767123287671)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a_dasKHtEeKNUa7kbzEWsw" id="(0.8493975903614458,0.011764705882352941)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FIJaHKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_FIJaIKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaIaH2EeKNUa7kbzEWsw" x="-118" y="-19"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FIJaIqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaI6H2EeKNUa7kbzEWsw" x="-3" y="-24"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaHaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaHqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaH6H2EeKNUa7kbzEWsw" points="[0, -7, 691, 404]$[0, -493, 691, -82]$[-682, -493, 9, -82]$[-682, -412, 9, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJrV0KH2EeKNUa7kbzEWsw" id="(0.5578947368421052,0.0427807486631016)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a5to8KH2EeKNUa7kbzEWsw" id="(0.8190954773869347,0.03333333333333333)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FIJaJKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_FIJaKKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaKaH2EeKNUa7kbzEWsw" x="-31" y="28"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FITLEKH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FITLEaH2EeKNUa7kbzEWsw" x="79" y="13"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaJaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaJqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaJ6H2EeKNUa7kbzEWsw" points="[-7, -8, 798, 384]$[-7, -518, 798, -126]$[-805, -518, 0, -126]$[-805, -413, 0, -21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PMCg4KH2EeKNUa7kbzEWsw" id="(0.9438596491228071,0.0481283422459893)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSd0kKH2EeKNUa7kbzEWsw" id="(0.7989949748743719,0.36666666666666664)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hoQknKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hoQkoKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkoaH2EeKNUa7kbzEWsw" x="-955" y="189"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hoQkoqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQko6H2EeKNUa7kbzEWsw" x="-949" y="65"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQknaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQknqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localRowHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkn6H2EeKNUa7kbzEWsw" points="[7, 5, 915, 798]$[7, 211, 915, 1004]$[-598, 211, 310, 1004]$[-608, -793, 300, 0]$[-906, -793, 2, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NyG_cKJ4EeKNUa7kbzEWsw" id="(0.7894736842105263,0.9657534246575342)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uz2j4KJ4EeKNUa7kbzEWsw" id="(0.9912663755458515,0.45)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hoQkpKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hoQkqKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkqaH2EeKNUa7kbzEWsw" x="-394" y="-888"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hoQkqqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkq6H2EeKNUa7kbzEWsw" x="-246" y="-893"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQkpaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQkpqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localColumnHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkp6H2EeKNUa7kbzEWsw" points="[1, 6, 843, 815]$[1, 131, 843, 940]$[-480, 131, 362, 940]$[-480, -803, 362, 6]$[-838, -803, 4, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NTAooKJ4EeKNUa7kbzEWsw" id="(0.3355263157894737,0.958904109589041)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m2_6UKH2EeKNUa7kbzEWsw" id="(0.982532751091703,0.16666666666666666)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj1bAqH3EeKNUa7kbzEWsw" type="3003" source="_xjigEKH3EeKNUa7kbzEWsw" target="_xjrqDKH3EeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bA6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj1bBKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj1bBaH3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4KH3EeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4aH3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj_MAKH3EeKNUa7kbzEWsw" type="3003" source="_xjigHKH3EeKNUa7kbzEWsw" target="_xjrqJKH3EeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MAaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MAqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MA6H3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4qH3EeKNUa7kbzEWsw" id="(0.4968944099378882,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ46H3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj_MGKH3EeKNUa7kbzEWsw" type="3003" source="_xjrqDKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MGaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MGqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MG6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xkIV-KH3EeKNUa7kbzEWsw" type="3003" source="_xjrqJKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xkIV-aH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xkIV-qH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xkIV-6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_EfChwKHtEeKNUa7kbzEWsw" type="1005">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA4aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMSwKHtEeKNUa7kbzEWsw" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMSwaHtEeKNUa7kbzEWsw" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_hJG1UqH0EeKNUa7kbzEWsw" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/ALPHABETIC"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1U6H0EeKNUa7kbzEWsw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_hJG1UKH0EeKNUa7kbzEWsw" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/NUMERIC"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1UaH0EeKNUa7kbzEWsw"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSwqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSw6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSxKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfChwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfChwqHtEeKNUa7kbzEWsw" x="10" y="910"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMSxaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA46HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMSyKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMSyaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSyqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSy6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSzKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMSzaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSzqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSz6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS0KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMSxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMSx6HtEeKNUa7kbzEWsw" x="1010" y="1430" width="183"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMS3aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA5qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA56HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMS4KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMS4aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS4qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS46HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS5KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMS5aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS5qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS56HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS6KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS36HtEeKNUa7kbzEWsw" x="1400" y="1255"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMS6aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA6KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA6aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMS7KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMS7aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS7qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS76HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS8KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMS8aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS8qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS86HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS9KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS66HtEeKNUa7kbzEWsw" x="2085" y="590" width="298" height="143"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMTDaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA7qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA76HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMTEKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMTEaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTEqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTE6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTFKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMTFaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTFqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTF6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTGKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTDqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTD6HtEeKNUa7kbzEWsw" x="1890" y="160"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMTGaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA8aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMTHKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMTHaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTHqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTH6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTIKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMTIaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTIqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTI6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTJKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTGqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTG6HtEeKNUa7kbzEWsw" x="295" y="1255"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMTJaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA86HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVcsKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVcsaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcsqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcs6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVctKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVctaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVctqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVct6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcuKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTJ6HtEeKNUa7kbzEWsw" x="415" y="925"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVcuaHtEeKNUa7kbzEWsw" type="1005">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA9KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA9aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVcvKHtEeKNUa7kbzEWsw" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVcvaHtEeKNUa7kbzEWsw" type="5008">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcvqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcv6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcwKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVcuqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableconfiguration/CellEditorDeclaration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcu6HtEeKNUa7kbzEWsw" x="15" y="750"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVczaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc0KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc0aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc0qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc06HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc1KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc1aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc1qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc16HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc2KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVczqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcz6HtEeKNUa7kbzEWsw" x="1315" y="395"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc2aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc3KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc3aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc3qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc36HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc4KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc4aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc4qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc46HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc5KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc26HtEeKNUa7kbzEWsw" x="1595" y="1595"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc5aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc6KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc6aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc6qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc66HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc7KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc7aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc7qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc76HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc8KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc5qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/JavaTableTester"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc56HtEeKNUa7kbzEWsw" x="2400" y="465"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc8aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc9KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc9aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc9qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc96HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc-KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc-aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc-qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc-6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc_KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc8qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc86HtEeKNUa7kbzEWsw" x="850" y="400" width="228" height="88"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc_aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBAaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVdAKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVdAaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdAqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdA6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdBKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVdBaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdBqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdB6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdCKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc_qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc_6HtEeKNUa7kbzEWsw" x="1605" y="1435"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVdCaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBA6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVdDKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVdDaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdDqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdD6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdEKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVdEaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdEqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdE6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdFKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdCqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdC6HtEeKNUa7kbzEWsw" x="1425" y="610"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVdLaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBCKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBCaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffNsKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffNsaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNsqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNs6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNtKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffNtaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNtqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNt6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNuKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdLqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdL6HtEeKNUa7kbzEWsw" x="80" y="355" height="93"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffNxaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBDKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBDaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffNyKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffNyaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNyqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNy6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNzKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffNzaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNzqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNz6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN0KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffNxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffNx6HtEeKNUa7kbzEWsw" x="1255" y="1595"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffN3aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBEaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffN4KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffN4aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN4qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN46HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN5KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffN5aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN5qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN56HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN6KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN36HtEeKNUa7kbzEWsw" x="1425" y="1595"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffN6aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBE6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffN7KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffN7aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN7qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN76HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN8KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffN8aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN8qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN86HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN9KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN66HtEeKNUa7kbzEWsw" x="1245" y="1435"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffN9aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBFaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffN-KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffN-aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN-qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN-6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN_KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffN_aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN_qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN_6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOAKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN9qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN96HtEeKNUa7kbzEWsw" x="1415" y="1435"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOAaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBF6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOBKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOBaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOBqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOB6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOCKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOCaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOCqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOC6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffODKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOAqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOA6HtEeKNUa7kbzEWsw" x="55" y="560"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffODaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBGKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBGaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOEKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOEaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOEqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOE6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOFKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOFaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOFqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOF6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOGKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffODqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/AbstractTableTester"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOD6HtEeKNUa7kbzEWsw" x="2415" y="300" width="208"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOJaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBHaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOKKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOKaHtEeKNUa7kbzEWsw" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_hJZwTqH0EeKNUa7kbzEWsw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/description"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwT6H0EeKNUa7kbzEWsw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_hJZwTKH0EeKNUa7kbzEWsw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwTaH0EeKNUa7kbzEWsw"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOKqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOK6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOLKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOLaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOLqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOL6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOMKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableNamedElement"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOJ6HtEeKNUa7kbzEWsw" x="2550" y="140"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOMaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBH6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffONKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffONaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffONqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffON6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOOKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOOaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOOqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOO6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOPKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOMqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOM6HtEeKNUa7kbzEWsw" x="1455" y="765"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOPaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBIKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBIaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOQKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOQaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOQqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOQ6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffORKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffORaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffORqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOR6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOSKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOPqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOP6HtEeKNUa7kbzEWsw" x="2585" y="565" height="187"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Ek_YwKHtEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Yw6HtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Ek_YxKHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YxaHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YxqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yx6HtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_YyKHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YyaHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YyqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yy6HtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Ek_YwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//Table"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek_YwqHtEeKNUa7kbzEWsw" x="2535" y="1080" height="146"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_rlVcQKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rlyIMKH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rlyIMaH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_rlVcQ6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_rlVcRKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcRaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcRqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcR6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_rlVcSKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcSaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcSqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcS6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_rlVcQaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rlVcQqH3EeKNUa7kbzEWsw" x="785" y="1080"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjigEKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4KH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB4aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjigE6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjigFKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigFaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigFqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigF6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjigGKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigGaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigGqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigG6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigEaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigEqH3EeKNUa7kbzEWsw" x="1510" y="1170"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjigHKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4qH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB46H3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjigH6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjigIKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigIaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigIqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigI6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjigJKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigJaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigJqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigJ6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigHaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigHqH3EeKNUa7kbzEWsw" x="1730" y="1170"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjrqDKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB6KH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB6aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjrqD6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjrqEKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqEaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqEqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqE6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjrqFKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqFaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqFqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqF6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqDaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqDqH3EeKNUa7kbzEWsw" x="1505" y="965"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjrqJKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB7KH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB7aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjrqJ6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjrqKKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqKaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqKqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqK6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjrqLKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqLaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqLqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqL6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqJaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqJqH3EeKNUa7kbzEWsw" x="1735" y="965"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#/"/>
+  <edges xmi:type="notation:Edge" xmi:id="_EghvgKHtEeKNUa7kbzEWsw" type="3003" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EghvgaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EghvgqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eghvg6HtEeKNUa7kbzEWsw" points="[4, 9, -119, -33]$[92, 9, -31, -33]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8EqHtEeKNUa7kbzEWsw" id="(0.9731543624161074,0.36666666666666664)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8E6HtEeKNUa7kbzEWsw" id="(0.2882882882882883,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrghKHtEeKNUa7kbzEWsw" type="3002" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgiKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgiaHtEeKNUa7kbzEWsw" x="8" y="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgiqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgi6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrghaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrghqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgh6HtEeKNUa7kbzEWsw" points="[4, 58, -32, -432]$[36, 490, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDaHtEeKNUa7kbzEWsw" id="(0.18633540372670807,0.9666666666666667)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDqHtEeKNUa7kbzEWsw" id="(0.22849462365591397,0.08602150537634409)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgjKHtEeKNUa7kbzEWsw" type="3003" source="_EffN9aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgj6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCaHtEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCqHtEeKNUa7kbzEWsw" id="(0.21739130434782608,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgkKHtEeKNUa7kbzEWsw" type="3003" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgkaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgkqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgk6HtEeKNUa7kbzEWsw" points="[0, 0, -112, 94]$[0, -30, -112, 64]$[112, -30, 0, 64]$[112, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BaHtEeKNUa7kbzEWsw" id="(0.10869565217391304,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrglKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrglaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrglqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgl6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FKHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FaHtEeKNUa7kbzEWsw" id="(0.7065217391304348,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgmKHtEeKNUa7kbzEWsw" type="3003" source="_EfMS6aHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgmaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgmqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgm6HtEeKNUa7kbzEWsw" points="[1, 0, -282, 442]$[1, -483, -282, -41]$[243, -483, -40, -41]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8CqHtEeKNUa7kbzEWsw" id="(0.7515527950310559,0.014705882352941176)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8C6HtEeKNUa7kbzEWsw" id="(0.2469879518072289,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgnKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgoKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgoaHtEeKNUa7kbzEWsw" x="-93" y="24"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgoqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgo6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgnaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgnqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnAxisProviders"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgn6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IKHtEeKNUa7kbzEWsw" id="(0.021052631578947368,0.29411764705882354)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IaHtEeKNUa7kbzEWsw" id="(0.9295302013422819,0.14685314685314685)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgpKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgqKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgqaHtEeKNUa7kbzEWsw" x="-93" y="15"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgqqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgq6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgpaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgpqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowAxisProviders"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgp6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FqHtEeKNUa7kbzEWsw" id="(0.017543859649122806,0.42780748663101603)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8F6HtEeKNUa7kbzEWsw" id="(0.9362416107382551,0.3776223776223776)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgrKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgsKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgsaHtEeKNUa7kbzEWsw" x="-56" y="-20"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgsqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgs6HtEeKNUa7kbzEWsw" x="23" y="-20"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgraHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgrqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultRowAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgr6HtEeKNUa7kbzEWsw" points="[-3, -19, 71, 510]$[-73, -523, 1, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8GqHtEeKNUa7kbzEWsw" id="(0.04912280701754386,0.7549019607843137)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8G6HtEeKNUa7kbzEWsw" id="(0.9832214765100671,0.7972027972027972)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgtKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrguKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrguaHtEeKNUa7kbzEWsw" x="-81" y="12"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrguqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgu6HtEeKNUa7kbzEWsw" x="7" y="12"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgtaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgtqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultColumnAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgt6HtEeKNUa7kbzEWsw" points="[0, -3, 27, 510]$[-27, -507, 0, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HKHtEeKNUa7kbzEWsw" id="(0.0,0.6203208556149733)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HaHtEeKNUa7kbzEWsw" id="(0.9563758389261745,0.6363636363636364)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg0qcKHtEeKNUa7kbzEWsw" type="3003" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qc6HtEeKNUa7kbzEWsw" points="[0, 0, 31, 155]$[0, -69, 31, 86]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGD6HtEeKNUa7kbzEWsw" id="(0.6645962732919255,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEKHtEeKNUa7kbzEWsw" id="(0.10067114093959731,0.3916083916083916)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg0qjKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTDaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qj6HtEeKNUa7kbzEWsw" points="[13, 8, 198, -412]$[13, 130, 198, -290]$[-161, 130, 24, -290]$[-161, 405, 24, -15]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGA6HtEeKNUa7kbzEWsw" id="(0.36180904522613067,0.8666666666666667)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGBKHtEeKNUa7kbzEWsw" id="(0.7115384615384616,0.13445378151260504)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg-bfKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTGaHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bfaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bfqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bf6HtEeKNUa7kbzEWsw" points="[-53, 0, -81, 264]$[-53, -288, -81, -24]$[9, -288, -19, -24]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF96HtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-KHtEeKNUa7kbzEWsw" id="(0.091324200913242,0.8)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg-bgKHtEeKNUa7kbzEWsw" type="3002" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMTGaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Eg-bhKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bhaHtEeKNUa7kbzEWsw" x="-12" y="-83"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Eg-bhqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bh6HtEeKNUa7kbzEWsw" x="-32" y="-37"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bgaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bgqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bg6HtEeKNUa7kbzEWsw" points="[-9, 58, 813, 121]$[-9, 95, 813, 158]$[-822, 95, 0, 158]$[-822, -63, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8B6HtEeKNUa7kbzEWsw" id="(0.8214285714285714,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg-bjKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Eg-bkKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bkaHtEeKNUa7kbzEWsw" x="84" y="84"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Eg-bkqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bk6HtEeKNUa7kbzEWsw" x="44" y="15"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bjaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bjqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bj6HtEeKNUa7kbzEWsw" points="[0, 0, 1127, 427]$[0, -45, 1127, 382]$[-1136, -45, -9, 382]$[-1136, -427, -9, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGaHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGqHtEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlYKHtEeKNUa7kbzEWsw" type="3002" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVc8aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EhHlZKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZaHtEeKNUa7kbzEWsw" x="-42" y="-89"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EhHlZqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZ6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlYaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlYqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlY6HtEeKNUa7kbzEWsw" points="[-12, 1, 286, -14]$[-261, 13, 37, -2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AKHtEeKNUa7kbzEWsw" id="(0.056768558951965066,0.8)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AaHtEeKNUa7kbzEWsw" id="(0.8947368421052632,0.5568181818181818)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlaKHtEeKNUa7kbzEWsw" type="3003" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlaaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlaqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHla6HtEeKNUa7kbzEWsw" points="[0, 0, -255, 239]$[0, -209, -255, 30]$[255, -209, 0, 30]$[255, -239, 0, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHKHtEeKNUa7kbzEWsw" id="(0.3317307692307692,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlbKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc2aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlbaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlbqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlb6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9aHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9qHtEeKNUa7kbzEWsw" id="(0.4144144144144144,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlcKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc5aHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlc6HtEeKNUa7kbzEWsw" points="[0, 0, 254, 111]$[0, -30, 254, 81]$[-254, -30, 0, 81]$[-254, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAaHtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAqHtEeKNUa7kbzEWsw" id="(0.25,0.9264705882352942)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhRWeKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWeaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWeqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWe6HtEeKNUa7kbzEWsw" points="[0, 0, -120, 102]$[0, -30, -120, 72]$[120, -30, 0, 72]$[120, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGE6HtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFKHtEeKNUa7kbzEWsw" id="(0.2072072072072072,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhbHdKHtEeKNUa7kbzEWsw" type="3003" source="_EffOAaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHdaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHdqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHd6HtEeKNUa7kbzEWsw" points="[-3, 0, 19, 114]$[-3, -114, 19, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGB6HtEeKNUa7kbzEWsw" id="(0.2931726907630522,0.014705882352941176)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCKHtEeKNUa7kbzEWsw" id="(0.25,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhkRUKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRUaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRUqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRU6HtEeKNUa7kbzEWsw" points="[0, 0, -111, 94]$[0, -30, -111, 64]$[111, -30, 0, 64]$[111, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DaHtEeKNUa7kbzEWsw" id="(0.24806201550387597,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhkRVKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRVaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRVqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRV6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8D6HtEeKNUa7kbzEWsw" id="(0.5765765765765766,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhkRWKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRW6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEaHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEqHtEeKNUa7kbzEWsw" id="(0.49612403100775193,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhuCUKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EhuCVKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCVaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EhuCVqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCV6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCUaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCUqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/creationTester"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCU6HtEeKNUa7kbzEWsw" points="[0, 0, 89, 284]$[-89, -284, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IqHtEeKNUa7kbzEWsw" id="(0.05964912280701754,0.0427807486631016)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8I6HtEeKNUa7kbzEWsw" id="(0.8920454545454546,0.9705882352941176)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhuCWKHtEeKNUa7kbzEWsw" type="3003" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCW6HtEeKNUa7kbzEWsw" points="[-169, 0, 1, 431]$[-169, -427, 1, 4]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIaHtEeKNUa7kbzEWsw" id="(0.9403508771929825,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIqHtEeKNUa7kbzEWsw" id="(0.8012048192771084,0.9529411764705882)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Ek_YzqHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOPaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y0qHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y06HtEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y1KHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y1aHtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Yz6HtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y0KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y0aHtEeKNUa7kbzEWsw" points="[9, -10, 0, 336]$[9, -340, 0, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir5h8KHtEeKNUa7kbzEWsw" id="(0.8552631578947368,0.07534246575342465)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kbepMKHtEeKNUa7kbzEWsw" id="(0.3087719298245614,0.9411764705882353)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y1qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y2qHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y26HtEeKNUa7kbzEWsw" x="-335" y="102"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y3KHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y3aHtEeKNUa7kbzEWsw" x="-325" y="20"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y16HtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y2KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/columnAxisProvidersHistory"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y2aHtEeKNUa7kbzEWsw" points="[-146, 0, 271, 460]$[-411, 0, 6, 460]$[-411, -453, 6, 7]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7tvZUKHuEeKNUa7kbzEWsw" id="(0.9736842105263158,0.726027397260274)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6fePYKHuEeKNUa7kbzEWsw" id="(0.6073825503355704,0.8970588235294118)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y3qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y4qHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y46HtEeKNUa7kbzEWsw" x="-356" y="129"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y5KHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y5aHtEeKNUa7kbzEWsw" x="-356" y="37"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y36HtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y4KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/rowAxisProvidersHistory"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y4aHtEeKNUa7kbzEWsw" points="[-145, 0, 308, 485]$[-445, 0, 8, 485]$[-445, -480, 8, 5]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EDnkKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.910958904109589)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__1i8MKHuEeKNUa7kbzEWsw" id="(0.4798657718120805,0.9264705882352942)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ElJJ0KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_ElJJ1KHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ1aHtEeKNUa7kbzEWsw" x="-309" y="104"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_ElJJ1qHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ16HtEeKNUa7kbzEWsw" x="-308" y="19"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ0aHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ0qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentRowAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ06HtEeKNUa7kbzEWsw" points="[-137, 0, 235, 423]$[-372, 0, 0, 423]$[-372, -420, 0, 3]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ETwEKHuEeKNUa7kbzEWsw" id="(0.9144736842105263,0.4931506849315068)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyW7AKH1EeKNUa7kbzEWsw" id="(0.7281879194630873,0.9558823529411765)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ElJJ2KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_ElJJ3KHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ3aHtEeKNUa7kbzEWsw" x="-235" y="120"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_ElJJ3qHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ36HtEeKNUa7kbzEWsw" x="-230" y="31"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ2aHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentColumnAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ26HtEeKNUa7kbzEWsw" points="[-90, 0, 197, 386]$[-287, 0, 0, 386]$[-287, -384, 0, 2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0FtQ8KHuEeKNUa7kbzEWsw" id="(0.6052631578947368,0.2465753424657534)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXzXYKHuEeKNUa7kbzEWsw" id="(0.8557046979865772,0.9705882352941176)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ElJJ4KHtEeKNUa7kbzEWsw" type="3003" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ4aHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ4qHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ46HtEeKNUa7kbzEWsw" points="[5, 40, -4, 1013]$[315, 40, 306, 1013]$[315, -931, 306, 42]$[34, -931, 25, 42]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdYFoKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.2328767123287671)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a_dasKHtEeKNUa7kbzEWsw" id="(0.8493975903614458,0.011764705882352941)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_FIJaHKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_FIJaIKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaIaH2EeKNUa7kbzEWsw" x="-118" y="-19"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_FIJaIqH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaI6H2EeKNUa7kbzEWsw" x="-3" y="-24"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaHaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaHqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaH6H2EeKNUa7kbzEWsw" points="[0, -7, 691, 404]$[0, -493, 691, -82]$[-682, -493, 9, -82]$[-682, -412, 9, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJrV0KH2EeKNUa7kbzEWsw" id="(0.5578947368421052,0.0427807486631016)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a5to8KH2EeKNUa7kbzEWsw" id="(0.8190954773869347,0.03333333333333333)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_FIJaJKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_FIJaKKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaKaH2EeKNUa7kbzEWsw" x="-31" y="28"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_FITLEKH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FITLEaH2EeKNUa7kbzEWsw" x="79" y="13"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaJaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaJqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaJ6H2EeKNUa7kbzEWsw" points="[-7, -8, 798, 384]$[-7, -518, 798, -126]$[-805, -518, 0, -126]$[-805, -413, 0, -21]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PMCg4KH2EeKNUa7kbzEWsw" id="(0.9438596491228071,0.0481283422459893)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSd0kKH2EeKNUa7kbzEWsw" id="(0.7989949748743719,0.36666666666666664)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hoQknKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hoQkoKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkoaH2EeKNUa7kbzEWsw" x="-955" y="189"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hoQkoqH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQko6H2EeKNUa7kbzEWsw" x="-949" y="65"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQknaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hoQknqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localRowHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkn6H2EeKNUa7kbzEWsw" points="[7, 5, 915, 798]$[7, 211, 915, 1004]$[-598, 211, 310, 1004]$[-608, -793, 300, 0]$[-906, -793, 2, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NyG_cKJ4EeKNUa7kbzEWsw" id="(0.7894736842105263,0.9657534246575342)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uz2j4KJ4EeKNUa7kbzEWsw" id="(0.9912663755458515,0.45)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hoQkpKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hoQkqKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkqaH2EeKNUa7kbzEWsw" x="-394" y="-888"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hoQkqqH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkq6H2EeKNUa7kbzEWsw" x="-246" y="-893"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQkpaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hoQkpqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localColumnHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkp6H2EeKNUa7kbzEWsw" points="[1, 6, 843, 815]$[1, 131, 843, 940]$[-480, 131, 362, 940]$[-480, -803, 362, 6]$[-838, -803, 4, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NTAooKJ4EeKNUa7kbzEWsw" id="(0.3355263157894737,0.958904109589041)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m2_6UKH2EeKNUa7kbzEWsw" id="(0.982532751091703,0.16666666666666666)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xj1bAqH3EeKNUa7kbzEWsw" type="3003" source="_xjigEKH3EeKNUa7kbzEWsw" target="_xjrqDKH3EeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bA6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xj1bBKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj1bBaH3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4KH3EeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4aH3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xj_MAKH3EeKNUa7kbzEWsw" type="3003" source="_xjigHKH3EeKNUa7kbzEWsw" target="_xjrqJKH3EeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MAaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MAqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MA6H3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4qH3EeKNUa7kbzEWsw" id="(0.4968944099378882,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ46H3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xj_MGKH3EeKNUa7kbzEWsw" type="3003" source="_xjrqDKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MGaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MGqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MG6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xkIV-KH3EeKNUa7kbzEWsw" type="3003" source="_xjrqJKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xkIV-aH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xkIV-qH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xkIV-6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
index db85685b5a0..63cb5eab27c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
@@ -1,336 +1,336 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxis.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_e_NAAKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAA6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NABKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NABaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NABqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAB6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NACKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NACaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NACqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAC6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAAqHoEeKNUa7kbzEWsw" x="755" y="525"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NADKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAD6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAEKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAEaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAEqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAE6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAFKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAFaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAFqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAF6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NADaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NADqHoEeKNUa7kbzEWsw" x="590" y="525"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAGKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAG6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAHKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAHaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAHqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAH6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAIKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAIaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAIqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAI6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAGaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAGqHoEeKNUa7kbzEWsw" x="500" y="350"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAJKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAJ6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAKKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAKaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAKqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAK6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NALKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NALaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NALqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAL6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAJaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAJqHoEeKNUa7kbzEWsw" x="850" y="350"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAMKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAM6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NANKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NANaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NANqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAN6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAOKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAOaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAOqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAO6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAMaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAMqHoEeKNUa7kbzEWsw" x="665" y="350"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAPKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAP6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAQKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAQaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAQqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAQ6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NARKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NARaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NARqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAR6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAPaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAPqHoEeKNUa7kbzEWsw" x="455" y="220"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NASKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAS6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NATKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NATaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NATqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAT6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAUKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAUaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAUqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAU6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NASaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NASqHoEeKNUa7kbzEWsw" x="920" y="525"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_WxAKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_WxA6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_WxBKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxBaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxBqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxB6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_WxCKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxCaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxCqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxC6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_WxAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_WxAqHoEeKNUa7kbzEWsw" x="430" y="460"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_hgnz4KHoEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hhEf0KHoEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hhEf0aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_hgnz46HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_hgnz5KHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz5aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz5qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz56HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hgnz6KHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz6aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz6qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz66HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_hgnz4aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgnz4qHoEeKNUa7kbzEWsw" x="880" y="700"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_kA2U8KHoEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kBTA4KHoEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kBTA4aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_kA2U86HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_kA2U9KHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U9aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U9qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U96HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_kA2U-KHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U-aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U-qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U-6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_kA2U8aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kA2U8qHoEeKNUa7kbzEWsw" x="250" y="625"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_g0n0EKHpEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g06vAKHpEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g06vAaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_g0n0E6HpEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_g0n0FKHpEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0FaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0FqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0F6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_g0n0GKHpEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0GaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0GqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0G6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_g0n0EaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g0n0EqHpEeKNUa7kbzEWsw" x="825" y="-15"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_hPGwoKHpEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hPZrkKHpEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hPZrkaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_hPGwo6HpEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_hPGwpKHpEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwpaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwpqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwp6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hPGwqKHpEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwqaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwqqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwq6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_hPGwoaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hPGwoqHpEeKNUa7kbzEWsw" x="75" y="-15"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxis"/>

-  <edges xmi:type="notation:Edge" xmi:id="_e_f68KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f68aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_f68qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f686HoEeKNUa7kbzEWsw" points="[0, 0, 41, 60]$[0, -30, 41, 30]$[-41, -30, 0, 30]$[-41, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6KHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6aHoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_f69KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f69aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_f69qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f696HoEeKNUa7kbzEWsw" points="[0, 0, -62, 68]$[0, -30, -62, 38]$[62, -30, 0, 38]$[62, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6qHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX66HoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr8KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr8aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr8qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr86HoEeKNUa7kbzEWsw" points="[0, 0, -44, 60]$[0, -30, -44, 30]$[44, -30, 0, 30]$[44, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5KHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr9KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr9aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr9qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr96HoEeKNUa7kbzEWsw" points="[0, 0, 59, 68]$[0, -30, 59, 38]$[-59, -30, 0, 38]$[-59, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5qHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX56HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr-KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr-aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr-qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr-6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7aHoEeKNUa7kbzEWsw" id="(0.2608695652173913,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr_KHoEeKNUa7kbzEWsw" type="3003" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr_aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr_qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr_6HoEeKNUa7kbzEWsw" points="[0, 0, -52, 68]$[0, -30, -52, 38]$[52, -30, 0, 38]$[52, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_psAKHoEeKNUa7kbzEWsw" type="3003" source="_e_NASKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psAaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_psAqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psA6HoEeKNUa7kbzEWsw" points="[0, 0, 54, 68]$[0, -30, 54, 38]$[-54, -30, 0, 38]$[-54, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7qHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX76HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_psBKHoEeKNUa7kbzEWsw" type="3003" source="_e_NAMKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psBaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_psBqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psB6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4qHoEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX46HoEeKNUa7kbzEWsw" id="(0.7364130434782609,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hg6u0KHoEeKNUa7kbzEWsw" type="3002" source="_e_NASKHoEeKNUa7kbzEWsw" target="_hgnz4KHoEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hg6u1KHoEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u1aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hg6u1qHoEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u16HoEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hg6u0aHoEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hg6u0qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis/element"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hg6u06HoEeKNUa7kbzEWsw" points="[-42, -20, 934, 461]$[-975, -481, 1, 0]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_kBJ28KHoEeKNUa7kbzEWsw" type="3002" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_kA2U8KHoEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_kBJ29KHoEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ29aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_kBJ29qHoEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ296HoEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kBJ28aHoEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_kBJ28qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EObjectAxis/element"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBJ286HoEeKNUa7kbzEWsw" points="[-21, -20, 460, 461]$[-480, -480, 1, 1]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_AtBlgKHpEeKNUa7kbzEWsw" type="3003" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AtBlgaHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_AtBlgqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AtBlg6HpEeKNUa7kbzEWsw" points="[39, -12, 85, 76]$[39, -97, 85, -9]$[-40, -97, 6, -9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AtBlhKHpEeKNUa7kbzEWsw" id="(0.11764705882352941,0.3023255813953488)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Td64sKHpEeKNUa7kbzEWsw" id="(0.9836956521739131,0.8235294117647058)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_g0w-AqHpEeKNUa7kbzEWsw" type="3002" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_g0n0EKHpEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_g0w-BqHpEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-B6HpEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_g0w-CKHpEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-CaHpEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_g0w-A6HpEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_g0w-BKHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g0w-BaHpEeKNUa7kbzEWsw" points="[-50, -21, 851, 350]$[-900, -371, 1, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jnSwAKHpEeKNUa7kbzEWsw" id="(0.9117647058823529,0.11627906976744186)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hPP6kKHpEeKNUa7kbzEWsw" type="3002" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hPP6lKHpEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6laHpEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hPP6lqHpEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6l6HpEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6kaHpEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6kqHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6k6HpEeKNUa7kbzEWsw" points="[-50, 0, 317, 344]$[-367, 0, 0, 344]$[-367, -302, 0, 42]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hPP6mKHpEeKNUa7kbzEWsw" type="3003" source="_g0n0EKHpEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6maHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6mqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6m6HpEeKNUa7kbzEWsw" points="[-111, -39, 1091, 387]$[-1201, -426, 1, 0]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxis.ecorediag" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_e_NAAKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAA6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NABKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NABaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NABqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAB6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NACKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NACaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NACqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAC6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAAqHoEeKNUa7kbzEWsw" x="755" y="525"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NADKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAD6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAEKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAEaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAEqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAE6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAFKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAFaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAFqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAF6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NADaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NADqHoEeKNUa7kbzEWsw" x="590" y="525"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAGKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAG6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAHKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAHaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAHqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAH6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAIKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAIaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAIqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAI6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAGaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAGqHoEeKNUa7kbzEWsw" x="500" y="350"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAJKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAJ6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAKKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAKaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAKqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAK6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NALKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NALaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NALqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAL6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAJaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAJqHoEeKNUa7kbzEWsw" x="850" y="350"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAMKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAM6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NANKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NANaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NANqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAN6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAOKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAOaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAOqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAO6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAMaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAMqHoEeKNUa7kbzEWsw" x="665" y="350"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAPKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAP6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAQKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAQaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAQqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAQ6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NARKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NARaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NARqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAR6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAPaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAPqHoEeKNUa7kbzEWsw" x="455" y="220"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NASKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAS6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NATKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NATaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NATqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAT6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAUKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAUaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAUqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAU6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NASaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NASqHoEeKNUa7kbzEWsw" x="920" y="525"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_WxAKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_WxA6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_WxBKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxBaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxBqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxB6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_WxCKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxCaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxCqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxC6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_WxAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_WxAqHoEeKNUa7kbzEWsw" x="430" y="460"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_hgnz4KHoEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hhEf0KHoEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hhEf0aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_hgnz46HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_hgnz5KHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz5aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz5qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz56HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hgnz6KHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz6aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz6qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz66HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_hgnz4aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgnz4qHoEeKNUa7kbzEWsw" x="880" y="700"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_kA2U8KHoEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kBTA4KHoEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kBTA4aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_kA2U86HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_kA2U9KHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U9aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U9qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U96HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_kA2U-KHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U-aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U-qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U-6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_kA2U8aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kA2U8qHoEeKNUa7kbzEWsw" x="250" y="625"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_g0n0EKHpEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g06vAKHpEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g06vAaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_g0n0E6HpEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_g0n0FKHpEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0FaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0FqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0F6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_g0n0GKHpEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0GaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0GqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0G6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_g0n0EaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g0n0EqHpEeKNUa7kbzEWsw" x="825" y="-15"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_hPGwoKHpEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hPZrkKHpEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hPZrkaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_hPGwo6HpEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_hPGwpKHpEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwpaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwpqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwp6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hPGwqKHpEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwqaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwqqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwq6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_hPGwoaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hPGwoqHpEeKNUa7kbzEWsw" x="75" y="-15"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxis"/>
+  <edges xmi:type="notation:Edge" xmi:id="_e_f68KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f68aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_f68qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f686HoEeKNUa7kbzEWsw" points="[0, 0, 41, 60]$[0, -30, 41, 30]$[-41, -30, 0, 30]$[-41, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6KHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6aHoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_f69KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f69aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_f69qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f696HoEeKNUa7kbzEWsw" points="[0, 0, -62, 68]$[0, -30, -62, 38]$[62, -30, 0, 38]$[62, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6qHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX66HoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr8KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr8aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr8qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr86HoEeKNUa7kbzEWsw" points="[0, 0, -44, 60]$[0, -30, -44, 30]$[44, -30, 0, 30]$[44, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5KHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr9KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr9aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr9qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr96HoEeKNUa7kbzEWsw" points="[0, 0, 59, 68]$[0, -30, 59, 38]$[-59, -30, 0, 38]$[-59, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5qHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX56HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr-KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr-aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr-qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr-6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7aHoEeKNUa7kbzEWsw" id="(0.2608695652173913,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr_KHoEeKNUa7kbzEWsw" type="3003" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr_aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr_qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr_6HoEeKNUa7kbzEWsw" points="[0, 0, -52, 68]$[0, -30, -52, 38]$[52, -30, 0, 38]$[52, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_psAKHoEeKNUa7kbzEWsw" type="3003" source="_e_NASKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psAaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_psAqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psA6HoEeKNUa7kbzEWsw" points="[0, 0, 54, 68]$[0, -30, 54, 38]$[-54, -30, 0, 38]$[-54, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7qHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX76HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_psBKHoEeKNUa7kbzEWsw" type="3003" source="_e_NAMKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psBaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_psBqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psB6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4qHoEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX46HoEeKNUa7kbzEWsw" id="(0.7364130434782609,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hg6u0KHoEeKNUa7kbzEWsw" type="3002" source="_e_NASKHoEeKNUa7kbzEWsw" target="_hgnz4KHoEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hg6u1KHoEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u1aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hg6u1qHoEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u16HoEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hg6u0aHoEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hg6u0qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis/element"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hg6u06HoEeKNUa7kbzEWsw" points="[-42, -20, 934, 461]$[-975, -481, 1, 0]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_kBJ28KHoEeKNUa7kbzEWsw" type="3002" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_kA2U8KHoEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_kBJ29KHoEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ29aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_kBJ29qHoEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ296HoEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kBJ28aHoEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_kBJ28qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EObjectAxis/element"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBJ286HoEeKNUa7kbzEWsw" points="[-21, -20, 460, 461]$[-480, -480, 1, 1]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_AtBlgKHpEeKNUa7kbzEWsw" type="3003" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AtBlgaHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AtBlgqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AtBlg6HpEeKNUa7kbzEWsw" points="[39, -12, 85, 76]$[39, -97, 85, -9]$[-40, -97, 6, -9]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AtBlhKHpEeKNUa7kbzEWsw" id="(0.11764705882352941,0.3023255813953488)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Td64sKHpEeKNUa7kbzEWsw" id="(0.9836956521739131,0.8235294117647058)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_g0w-AqHpEeKNUa7kbzEWsw" type="3002" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_g0n0EKHpEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_g0w-BqHpEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-B6HpEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_g0w-CKHpEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-CaHpEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_g0w-A6HpEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_g0w-BKHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g0w-BaHpEeKNUa7kbzEWsw" points="[-50, -21, 851, 350]$[-900, -371, 1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jnSwAKHpEeKNUa7kbzEWsw" id="(0.9117647058823529,0.11627906976744186)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hPP6kKHpEeKNUa7kbzEWsw" type="3002" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hPP6lKHpEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6laHpEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hPP6lqHpEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6l6HpEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6kaHpEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6kqHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6k6HpEeKNUa7kbzEWsw" points="[-50, 0, 317, 344]$[-367, 0, 0, 344]$[-367, -302, 0, 42]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hPP6mKHpEeKNUa7kbzEWsw" type="3003" source="_g0n0EKHpEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6maHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6mqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6m6HpEeKNUa7kbzEWsw" points="[-111, -39, 1091, 387]$[-1201, -426, 1, 0]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
index 0608de992ed..1fc01ed654b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
@@ -1,295 +1,295 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_0KgVkKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVk6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVlKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVlaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVlqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVl6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVmKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVmaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVmqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVm6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISynchronizedAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVkqHnEeKNUa7kbzEWsw" x="345" y="335"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVnKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVn6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVoKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVoaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVoqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVo6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVpKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVpaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVpqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVp6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVnqHnEeKNUa7kbzEWsw" x="320" y="585" width="373"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVqKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVq6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVrKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVraHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVrqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVr6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVsKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVsaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVsqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVs6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVqaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVqqHnEeKNUa7kbzEWsw" x="135" y="440"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVwKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVw6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVxKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVxaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVxqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVx6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVyKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVyaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVyqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVy6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVwaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVwqHnEeKNUa7kbzEWsw" x="535" y="475"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVzKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVz6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgV0KHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgV0aHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgV0qHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgV06HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfgKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfgaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfgqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfg6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVzaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVzqHnEeKNUa7kbzEWsw" x="465" y="120"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KpfhKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0Kpfh6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KpfiKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfiaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfiqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfi6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfjKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfjaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfjqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfj6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfhaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfhqHnEeKNUa7kbzEWsw" x="480" y="230"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KpfkKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0Kpfk6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KpflKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpflaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpflqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfl6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfmKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfmaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfmqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfm6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfkqHnEeKNUa7kbzEWsw" x="160" y="335"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KpfnKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0Kpfn6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KpfoKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfoaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfoqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfo6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfpKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfpaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfpqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfp6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfnqHnEeKNUa7kbzEWsw" x="570" y="335"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_9Ll7kKHnEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9L5dkqHnEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9L5dk6HnEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_9Ll7k6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_9Ll7lKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7laHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7lqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7l6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_9Ll7mKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7maHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7mqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7m6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_9Ll7kaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Ll7kqHnEeKNUa7kbzEWsw" x="965" y="495" height="210"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_lHzcUKHwEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lIGXSKHwEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lIGXSaHwEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_lH9NUKHwEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_lH9NUaHwEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NUqHwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NU6HwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NVKHwEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_lH9NVaHwEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NVqHwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NV6HwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NWKHwEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lHzcUaHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHzcUqHwEeKNUa7kbzEWsw" x="40" y="100"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_atztMKHxEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_atztM6HxEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_atztNKHxEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztNaHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_atztNqHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztN6HxEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_atztOKHxEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztOaHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_atztOqHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztO6HxEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_atztMaHxEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_atztMqHxEeKNUa7kbzEWsw" x="565" y="410"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisprovider"/>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BgKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bg6HnEeKNUa7kbzEWsw" points="[0, 0, -91, 60]$[0, -30, -91, 30]$[91, -30, 0, 30]$[91, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZaHnEeKNUa7kbzEWsw" id="(0.39215686274509803,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BhKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVkKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bh6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 171]$[0, -171, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYKHnEeKNUa7kbzEWsw" id="(0.289544235924933,0.13953488372093023)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYaHnEeKNUa7kbzEWsw" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BiKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVwKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BiaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BiqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bi6HnEeKNUa7kbzEWsw" points="[10, -2, 77, 64]$[10, -63, 77, 3]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3cKHnEeKNUa7kbzEWsw" id="(0.8900804289544236,0.06976744186046512)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3caHnEeKNUa7kbzEWsw" id="(0.2737430167597765,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BjKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVqKHnEeKNUa7kbzEWsw" target="_0KpfkKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BjaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BjqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bj6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YqHnEeKNUa7kbzEWsw" id="(0.49760765550239233,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Y6HnEeKNUa7kbzEWsw" id="(0.4959349593495935,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLeKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_atztMKHxEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLeaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLeqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLe6HnEeKNUa7kbzEWsw" points="[-32, 0, 68, 59]$[-32, -24, 68, 35]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3bKHnEeKNUa7kbzEWsw" id="(0.7486033519553073,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3baHnEeKNUa7kbzEWsw" id="(0.01744186046511628,0.16279069767441862)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLfKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_0KgVzKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLfaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLfqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLf6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZqHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Z6HnEeKNUa7kbzEWsw" id="(0.49635036496350365,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLgKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfnKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLg6HnEeKNUa7kbzEWsw" points="[0, 0, 61, 70]$[0, -84, 61, -14]$[-56, -84, 5, -14]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YaHnEeKNUa7kbzEWsw" id="(0.9509803921568627,0.8604651162790697)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLhKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLh6HnEeKNUa7kbzEWsw" points="[0, 0, -278, 60]$[0, -30, -278, 30]$[278, -30, 0, 30]$[278, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aKHnEeKNUa7kbzEWsw" id="(0.4959349593495935,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aaHnEeKNUa7kbzEWsw" id="(0.19607843137254902,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_9LvslqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_9LvsmqHnEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvsm6HnEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_9LvsnKHnEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9LvsnaHnEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsl6HnEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsmKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider/listenFeature"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsmaHnEeKNUa7kbzEWsw" points="[-15, -20, 416, 551]$[-430, -570, 1, 1]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_9LvsnqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_9LvsoqHnEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvso6HnEeKNUa7kbzEWsw" x="-86" y="-20"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_9L5dkKHnEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9L5dkaHnEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsn6HnEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsoKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider/pastedElementContainmentFeature"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsoaHnEeKNUa7kbzEWsw" points="[89, 21, -360, -86]$[342, 81, -107, -26]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lpCrsKHxEeKNUa7kbzEWsw" id="(0.9832402234636871,0.8627450980392157)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lRZAsKHxEeKNUa7kbzEWsw" id="(0.055299539170506916,0.08717948717948718)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_lIGXQKHwEeKNUa7kbzEWsw" type="3002" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_lHzcUKHwEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_lIGXRKHwEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXRaHwEeKNUa7kbzEWsw" x="9" y="-47"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_lIGXRqHwEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXR6HwEeKNUa7kbzEWsw" x="9" y="31"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lIGXQaHwEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lIGXQqHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lIGXQ6HwEeKNUa7kbzEWsw" points="[-50, 0, 257, 109]$[-307, 0, 0, 109]$[-307, -67, 0, 42]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_dhhyAKHxEeKNUa7kbzEWsw" type="3003" source="_atztMKHxEeKNUa7kbzEWsw" target="_0KpfnKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dhhyAaHxEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_dhhyAqHxEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dhhyA6HxEeKNUa7kbzEWsw" points="[-19, -20, 36, 40]$[-53, -75, 2, -15]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_0KgVkKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVk6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVlKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVlaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVlqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVl6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVmKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVmaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVmqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVm6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISynchronizedAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVkqHnEeKNUa7kbzEWsw" x="345" y="335"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVnKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVn6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVoKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVoaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVoqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVo6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVpKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVpaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVpqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVp6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVnqHnEeKNUa7kbzEWsw" x="320" y="585" width="373"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVqKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVq6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVrKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVraHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVrqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVr6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVsKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVsaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVsqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVs6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVqaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVqqHnEeKNUa7kbzEWsw" x="135" y="440"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVwKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVw6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVxKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVxaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVxqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVx6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVyKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVyaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVyqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVy6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVwaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVwqHnEeKNUa7kbzEWsw" x="535" y="475"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVzKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVz6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgV0KHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgV0aHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgV0qHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgV06HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfgKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfgaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfgqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfg6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVzaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVzqHnEeKNUa7kbzEWsw" x="465" y="120"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KpfhKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0Kpfh6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KpfiKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfiaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfiqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfi6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfjKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfjaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfjqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfj6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfhaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfhqHnEeKNUa7kbzEWsw" x="480" y="230"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KpfkKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0Kpfk6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KpflKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpflaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpflqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfl6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfmKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfmaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfmqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfm6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfkqHnEeKNUa7kbzEWsw" x="160" y="335"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KpfnKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0Kpfn6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KpfoKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfoaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfoqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfo6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfpKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfpaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfpqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfp6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfnqHnEeKNUa7kbzEWsw" x="570" y="335"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_9Ll7kKHnEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9L5dkqHnEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9L5dk6HnEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_9Ll7k6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_9Ll7lKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7laHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7lqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7l6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_9Ll7mKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7maHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7mqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7m6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_9Ll7kaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Ll7kqHnEeKNUa7kbzEWsw" x="965" y="495" height="210"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_lHzcUKHwEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lIGXSKHwEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lIGXSaHwEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_lH9NUKHwEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_lH9NUaHwEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NUqHwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NU6HwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NVKHwEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_lH9NVaHwEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NVqHwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NV6HwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NWKHwEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_lHzcUaHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHzcUqHwEeKNUa7kbzEWsw" x="40" y="100"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_atztMKHxEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_atztM6HxEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_atztNKHxEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztNaHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_atztNqHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztN6HxEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_atztOKHxEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztOaHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_atztOqHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztO6HxEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_atztMaHxEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_atztMqHxEeKNUa7kbzEWsw" x="565" y="410"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisprovider"/>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BgKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bg6HnEeKNUa7kbzEWsw" points="[0, 0, -91, 60]$[0, -30, -91, 30]$[91, -30, 0, 30]$[91, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZaHnEeKNUa7kbzEWsw" id="(0.39215686274509803,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BhKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVkKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bh6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 171]$[0, -171, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYKHnEeKNUa7kbzEWsw" id="(0.289544235924933,0.13953488372093023)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYaHnEeKNUa7kbzEWsw" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BiKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVwKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BiaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BiqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bi6HnEeKNUa7kbzEWsw" points="[10, -2, 77, 64]$[10, -63, 77, 3]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3cKHnEeKNUa7kbzEWsw" id="(0.8900804289544236,0.06976744186046512)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3caHnEeKNUa7kbzEWsw" id="(0.2737430167597765,0.9411764705882353)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BjKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVqKHnEeKNUa7kbzEWsw" target="_0KpfkKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BjaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BjqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bj6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YqHnEeKNUa7kbzEWsw" id="(0.49760765550239233,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Y6HnEeKNUa7kbzEWsw" id="(0.4959349593495935,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLeKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_atztMKHxEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLeaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLeqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLe6HnEeKNUa7kbzEWsw" points="[-32, 0, 68, 59]$[-32, -24, 68, 35]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3bKHnEeKNUa7kbzEWsw" id="(0.7486033519553073,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3baHnEeKNUa7kbzEWsw" id="(0.01744186046511628,0.16279069767441862)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLfKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_0KgVzKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLfaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLfqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLf6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZqHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Z6HnEeKNUa7kbzEWsw" id="(0.49635036496350365,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLgKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfnKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLg6HnEeKNUa7kbzEWsw" points="[0, 0, 61, 70]$[0, -84, 61, -14]$[-56, -84, 5, -14]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YaHnEeKNUa7kbzEWsw" id="(0.9509803921568627,0.8604651162790697)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLhKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLh6HnEeKNUa7kbzEWsw" points="[0, 0, -278, 60]$[0, -30, -278, 30]$[278, -30, 0, 30]$[278, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aKHnEeKNUa7kbzEWsw" id="(0.4959349593495935,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aaHnEeKNUa7kbzEWsw" id="(0.19607843137254902,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_9LvslqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_9LvsmqHnEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvsm6HnEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_9LvsnKHnEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9LvsnaHnEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsl6HnEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsmKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider/listenFeature"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsmaHnEeKNUa7kbzEWsw" points="[-15, -20, 416, 551]$[-430, -570, 1, 1]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_9LvsnqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_9LvsoqHnEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvso6HnEeKNUa7kbzEWsw" x="-86" y="-20"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_9L5dkKHnEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9L5dkaHnEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsn6HnEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsoKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider/pastedElementContainmentFeature"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsoaHnEeKNUa7kbzEWsw" points="[89, 21, -360, -86]$[342, 81, -107, -26]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lpCrsKHxEeKNUa7kbzEWsw" id="(0.9832402234636871,0.8627450980392157)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lRZAsKHxEeKNUa7kbzEWsw" id="(0.055299539170506916,0.08717948717948718)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_lIGXQKHwEeKNUa7kbzEWsw" type="3002" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_lHzcUKHwEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_lIGXRKHwEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXRaHwEeKNUa7kbzEWsw" x="9" y="-47"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_lIGXRqHwEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXR6HwEeKNUa7kbzEWsw" x="9" y="31"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lIGXQaHwEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lIGXQqHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lIGXQ6HwEeKNUa7kbzEWsw" points="[-50, 0, 257, 109]$[-307, 0, 0, 109]$[-307, -67, 0, 42]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_dhhyAKHxEeKNUa7kbzEWsw" type="3003" source="_atztMKHxEeKNUa7kbzEWsw" target="_0KpfnKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dhhyAaHxEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_dhhyAqHxEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dhhyA6HxEeKNUa7kbzEWsw" points="[-19, -20, 36, 40]$[-53, -75, 2, -15]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
index 44fd09ed8ac..48a147a1ea7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
@@ -1,292 +1,292 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxisconfiguration" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_3EuuMKHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fMKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fMaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fMqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fM6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fNKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fNaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fNqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fN6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fOKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3EuuMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3EuuMqHrEeKNUa7kbzEWsw" x="565" y="225" height="68"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fOaHrEeKNUa7kbzEWsw" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_3E4fPKHrEeKNUa7kbzEWsw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fPaHrEeKNUa7kbzEWsw" type="5008">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fPqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fP6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fQKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fO6HrEeKNUa7kbzEWsw" x="20" y="20"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fQaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fRKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fRaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fRqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fR6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fSKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fSaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fSqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fS6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fTKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fQqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fQ6HrEeKNUa7kbzEWsw" x="1050" y="345"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fWaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fXKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fXaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fXqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fX6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fYKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fYaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fYqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fY6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fZKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fWqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fW6HrEeKNUa7kbzEWsw" x="95" y="550" width="198" height="78"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fZaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4faKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4faaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4faqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fa6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fbKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fbaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fbqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fb6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fcKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fZqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fZ6HrEeKNUa7kbzEWsw" x="855" y="235"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fcaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fdKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fdaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fdqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fd6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4feKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4feaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4feqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fe6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4ffKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fcqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fc6HrEeKNUa7kbzEWsw" x="115" y="395"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4ffaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fgKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fgaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fgqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fg6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fhKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fhaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fhqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fh6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fiKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4ffqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManager"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4ff6HrEeKNUa7kbzEWsw" x="575" y="105"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3FCQMKHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3FCQM6HrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3FCQNKHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQNaHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQNqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQN6HrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FCQOKHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQOaHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQOqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQO6HrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3FCQMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FCQMqHrEeKNUa7kbzEWsw" x="865" y="125" width="283"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_VWNvsKHsEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VWgqoKHsEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VWgqoaHsEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_VWNvs6HsEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_VWNvtKHsEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvtaHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvtqHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvt6HsEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWNvuKHsEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvuaHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvuqHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvu6HsEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_VWNvsaHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VWNvsqHsEeKNUa7kbzEWsw" x="260" y="265" width="208" height="103"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisconfiguration"/>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLIKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLJKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLJqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJ6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLIaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLIqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/axisManager"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLI6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBKHrEeKNUa7kbzEWsw" id="(0.4971751412429379,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBaHrEeKNUa7kbzEWsw" id="(0.49645390070921985,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLKKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLLKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLLaHrEeKNUa7kbzEWsw" x="-19" y="32"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLLqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLL6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLKaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLKqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localSpecificConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLK6HrEeKNUa7kbzEWsw" points="[0, 21, 426, -149]$[0, 170, 426, 0]$[-412, 170, 14, 0]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BEaHrEeKNUa7kbzEWsw" id="(0.889763779527559,0.5116279069767442)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLMKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3EuuMKHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLNKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLNaHrEeKNUa7kbzEWsw" x="-98" y="39"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLNqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLN6HrEeKNUa7kbzEWsw" x="-2" y="14"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLMaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLMqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLM6HrEeKNUa7kbzEWsw" points="[0, 0, -420, 60]$[420, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDKHrEeKNUa7kbzEWsw" id="(0.7467248908296943,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDaHrEeKNUa7kbzEWsw" id="(0.903954802259887,0.45588235294117646)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLOKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLPKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLPaHrEeKNUa7kbzEWsw" x="-4" y="-52"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLPqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLP6HrEeKNUa7kbzEWsw" x="3" y="-27"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLOaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLO6HrEeKNUa7kbzEWsw" points="[0, 9, 915, -4]$[-650, 9, 265, -4]$[-810, 9, 105, -4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBqHrEeKNUa7kbzEWsw" id="(0.0,0.7843137254901961)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BB6HrEeKNUa7kbzEWsw" id="(0.16535433070866143,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLQKHrEeKNUa7kbzEWsw" type="3003" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLQaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLQqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLQ6HrEeKNUa7kbzEWsw" points="[6, 5, -109, -279]$[6, 184, -109, -100]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCqHrEeKNUa7kbzEWsw" id="(0.7985865724381626,0.8837209302325582)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BC6HrEeKNUa7kbzEWsw" id="(0.75,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLRKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLRaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLRqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLR6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 163]$[0, -163, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDqHrEeKNUa7kbzEWsw" id="(0.4978165938864629,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BD6HrEeKNUa7kbzEWsw" id="(0.038461538461538464,0.6372549019607843)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FeVEKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fWaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVEaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVEqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVE6HrEeKNUa7kbzEWsw" points="[-10, -38, 6, 122]$[-10, -152, 6, 8]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAaHrEeKNUa7kbzEWsw" id="(0.49606299212598426,0.813953488372093)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FeVFKHrEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FeVGKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVGaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FeVGqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVG6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVFaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVFqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/specificAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVF6HrEeKNUa7kbzEWsw" points="[-69, 0, 398, -331]$[-467, 0, 0, -331]$[-467, 290, 0, -41]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAqHrEeKNUa7kbzEWsw" id="(0.49645390070921985,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BA6HrEeKNUa7kbzEWsw" id="(0.49606299212598426,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FeVHKHrEeKNUa7kbzEWsw" type="3002" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FeVIKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVIaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FeVIqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVI6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVHaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVHqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration/axisManagers"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVH6HrEeKNUa7kbzEWsw" points="[0, 0, -180, 111]$[129, -61, -51, 50]$[180, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCKHrEeKNUa7kbzEWsw" id="(0.6633165829145728,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCaHrEeKNUa7kbzEWsw" id="(0.9290780141843972,0.6666666666666666)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_VWXgsKHsEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_VWXgtKHsEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgtaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWXgtqHsEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgt6HsEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgsaHsEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgsqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgs6HsEeKNUa7kbzEWsw" points="[-103, -44, 856, 362]$[-958, -406, 1, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ivJfsKHsEeKNUa7kbzEWsw" id="(0.04807692307692308,0.14705882352941177)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcYZIKHsEeKNUa7kbzEWsw" id="(0.9615384615384616,0.8640776699029126)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_VWXguKHsEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_VWXgvKHsEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgvaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWXgvqHsEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgv6HsEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXguaHsEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXguqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/headerLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgu6HsEeKNUa7kbzEWsw" points="[-69, 0, 212, -186]$[-281, 0, 0, -186]$[-281, 136, 0, -50]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_VWXgwKHsEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_VWXgxKHsEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgxaHsEeKNUa7kbzEWsw" x="-116" y="-41"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWXgxqHsEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgx6HsEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgwaHsEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgwqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localHeaderLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgw6HsEeKNUa7kbzEWsw" points="[-37, -20, 421, 236]$[-457, -256, 1, 0]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvqqYKHsEeKNUa7kbzEWsw" id="(0.9423076923076923,0.0970873786407767)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxisconfiguration" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_3EuuMKHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fMKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fMaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fMqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fM6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fNKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fNaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fNqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fN6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fOKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3EuuMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3EuuMqHrEeKNUa7kbzEWsw" x="565" y="225" height="68"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fOaHrEeKNUa7kbzEWsw" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_3E4fPKHrEeKNUa7kbzEWsw" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fPaHrEeKNUa7kbzEWsw" type="5008">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fPqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fP6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fQKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fO6HrEeKNUa7kbzEWsw" x="20" y="20"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fQaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fRKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fRaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fRqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fR6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fSKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fSaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fSqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fS6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fTKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fQqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fQ6HrEeKNUa7kbzEWsw" x="1050" y="345"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fWaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fXKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fXaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fXqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fX6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fYKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fYaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fYqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fY6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fZKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fWqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fW6HrEeKNUa7kbzEWsw" x="95" y="550" width="198" height="78"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fZaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4faKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4faaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4faqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fa6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fbKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fbaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fbqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fb6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fcKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fZqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fZ6HrEeKNUa7kbzEWsw" x="855" y="235"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fcaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fdKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fdaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fdqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fd6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4feKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4feaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4feqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fe6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4ffKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fcqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fc6HrEeKNUa7kbzEWsw" x="115" y="395"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4ffaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fgKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fgaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fgqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fg6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fhKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fhaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fhqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fh6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fiKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4ffqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManager"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4ff6HrEeKNUa7kbzEWsw" x="575" y="105"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3FCQMKHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3FCQM6HrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3FCQNKHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQNaHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQNqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQN6HrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FCQOKHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQOaHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQOqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQO6HrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3FCQMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FCQMqHrEeKNUa7kbzEWsw" x="865" y="125" width="283"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_VWNvsKHsEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VWgqoKHsEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VWgqoaHsEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_VWNvs6HsEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_VWNvtKHsEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvtaHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvtqHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvt6HsEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWNvuKHsEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvuaHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvuqHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvu6HsEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_VWNvsaHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VWNvsqHsEeKNUa7kbzEWsw" x="260" y="265" width="208" height="103"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisconfiguration"/>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLIKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLJKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLJqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJ6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLIaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLIqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/axisManager"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLI6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBKHrEeKNUa7kbzEWsw" id="(0.4971751412429379,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBaHrEeKNUa7kbzEWsw" id="(0.49645390070921985,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLKKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLLKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLLaHrEeKNUa7kbzEWsw" x="-19" y="32"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLLqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLL6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLKaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLKqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localSpecificConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLK6HrEeKNUa7kbzEWsw" points="[0, 21, 426, -149]$[0, 170, 426, 0]$[-412, 170, 14, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BEaHrEeKNUa7kbzEWsw" id="(0.889763779527559,0.5116279069767442)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLMKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3EuuMKHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLNKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLNaHrEeKNUa7kbzEWsw" x="-98" y="39"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLNqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLN6HrEeKNUa7kbzEWsw" x="-2" y="14"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLMaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLMqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLM6HrEeKNUa7kbzEWsw" points="[0, 0, -420, 60]$[420, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDKHrEeKNUa7kbzEWsw" id="(0.7467248908296943,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDaHrEeKNUa7kbzEWsw" id="(0.903954802259887,0.45588235294117646)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLOKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLPKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLPaHrEeKNUa7kbzEWsw" x="-4" y="-52"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLPqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLP6HrEeKNUa7kbzEWsw" x="3" y="-27"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLOaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLO6HrEeKNUa7kbzEWsw" points="[0, 9, 915, -4]$[-650, 9, 265, -4]$[-810, 9, 105, -4]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBqHrEeKNUa7kbzEWsw" id="(0.0,0.7843137254901961)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BB6HrEeKNUa7kbzEWsw" id="(0.16535433070866143,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLQKHrEeKNUa7kbzEWsw" type="3003" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLQaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLQqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLQ6HrEeKNUa7kbzEWsw" points="[6, 5, -109, -279]$[6, 184, -109, -100]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCqHrEeKNUa7kbzEWsw" id="(0.7985865724381626,0.8837209302325582)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BC6HrEeKNUa7kbzEWsw" id="(0.75,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLRKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLRaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLRqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLR6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 163]$[0, -163, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDqHrEeKNUa7kbzEWsw" id="(0.4978165938864629,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BD6HrEeKNUa7kbzEWsw" id="(0.038461538461538464,0.6372549019607843)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FeVEKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fWaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVEaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVEqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVE6HrEeKNUa7kbzEWsw" points="[-10, -38, 6, 122]$[-10, -152, 6, 8]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAaHrEeKNUa7kbzEWsw" id="(0.49606299212598426,0.813953488372093)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FeVFKHrEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FeVGKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVGaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FeVGqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVG6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVFaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVFqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/specificAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVF6HrEeKNUa7kbzEWsw" points="[-69, 0, 398, -331]$[-467, 0, 0, -331]$[-467, 290, 0, -41]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAqHrEeKNUa7kbzEWsw" id="(0.49645390070921985,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BA6HrEeKNUa7kbzEWsw" id="(0.49606299212598426,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FeVHKHrEeKNUa7kbzEWsw" type="3002" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FeVIKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVIaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FeVIqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVI6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVHaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVHqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration/axisManagers"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVH6HrEeKNUa7kbzEWsw" points="[0, 0, -180, 111]$[129, -61, -51, 50]$[180, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCKHrEeKNUa7kbzEWsw" id="(0.6633165829145728,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCaHrEeKNUa7kbzEWsw" id="(0.9290780141843972,0.6666666666666666)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_VWXgsKHsEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_VWXgtKHsEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgtaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWXgtqHsEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgt6HsEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgsaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgsqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgs6HsEeKNUa7kbzEWsw" points="[-103, -44, 856, 362]$[-958, -406, 1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ivJfsKHsEeKNUa7kbzEWsw" id="(0.04807692307692308,0.14705882352941177)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcYZIKHsEeKNUa7kbzEWsw" id="(0.9615384615384616,0.8640776699029126)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_VWXguKHsEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_VWXgvKHsEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgvaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWXgvqHsEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgv6HsEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXguaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VWXguqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/headerLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgu6HsEeKNUa7kbzEWsw" points="[-69, 0, 212, -186]$[-281, 0, 0, -186]$[-281, 136, 0, -50]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_VWXgwKHsEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_VWXgxKHsEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgxaHsEeKNUa7kbzEWsw" x="-116" y="-41"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWXgxqHsEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgx6HsEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgwaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgwqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localHeaderLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgw6HsEeKNUa7kbzEWsw" points="[-37, -20, 421, 236]$[-457, -256, 1, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvqqYKHsEeKNUa7kbzEWsw" id="(0.9423076923076923,0.0970873786407767)"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
index 3ba5a9fd274..2c392fd8a0c 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
@@ -1,15 +1,15 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-pluginName = Papyrus Nattable Model

-providerName = Eclipse Modeling Project

-

-pluginDescription=This plugin provides the metamodel used by the nattable editor.

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+
+pluginName = Papyrus Nattable Model
+providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin provides the metamodel used by the nattable editor.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml
index 96c898ee4d5..79d9d6c89fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml
@@ -1,115 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2013 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

- 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+ 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+</plugin>
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 488de962481..407a56451ce 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
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public interface NattableFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattableFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Table</em>'.

-	 * @generated

-	 */

-	Table createTable();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattablePackage getNattablePackage();

-} // NattableFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+public interface NattableFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattableFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table</em>'.
+	 * @generated
+	 */
+	Table createTable();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattablePackage getNattablePackage();
+} // NattableFactory
diff --git a/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 94f82310f09..35866ade1b0 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
@@ -1,609 +1,609 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory

- * @model kind="package"

- *        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'"

- * @generated

- */

-public interface NattablePackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattable"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattable"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()

-	 * @generated

-	 */

-	int TABLE = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Context</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CONTEXT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Owner</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__OWNER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Prototype</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__PROTOTYPE = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Table Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__TABLE_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Invert Axis</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__INVERT_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Column Axis Providers History</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__COLUMN_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;

-

-	/**

-	 * The feature id for the '<em><b>Row Axis Providers History</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__ROW_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;

-

-	/**

-	 * The feature id for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;

-

-	/**

-	 * The feature id for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;

-

-	/**

-	 * The feature id for the '<em><b>Current Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CURRENT_ROW_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;

-

-	/**

-	 * The feature id for the '<em><b>Current Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CURRENT_COLUMN_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;

-

-	/**

-	 * The feature id for the '<em><b>Cells</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CELLS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;

-

-	/**

-	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 12;

-

-	/**

-	 * The feature id for the '<em><b>Table Kind Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__TABLE_KIND_ID = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 13;

-

-	/**

-	 * The number of structural features of the '<em>Table</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 14;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Table</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table

-	 * @generated

-	 */

-	EClass getTable();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Context</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_Context();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#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()

-	 * @generated

-	 */

-	EReference getTable_Owner();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EReference getTable_Prototype();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EReference getTable_TableConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Invert Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EAttribute getTable_InvertAxis();

-

-	/**

-	 * Returns the meta object for 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EReference getTable_Cells();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_OwnedCellEditorConfigurations();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Table Kind Id</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EAttribute getTable_TableKindId();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableFactory getNattableFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()

-		 * @generated

-		 */

-		EClass TABLE = eINSTANCE.getTable();

-

-		/**

-		 * The meta object literal for the '<em><b>Context</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__CONTEXT = eINSTANCE.getTable_Context();

-

-		/**

-		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__OWNER = eINSTANCE.getTable_Owner();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * The meta object literal for the '<em><b>Invert Axis</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE__INVERT_AXIS = eINSTANCE.getTable_InvertAxis();

-

-		/**

-		 * The meta object literal for the '<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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * The meta object literal for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTable_OwnedCellEditorConfigurations();

-

-		/**

-		 * The meta object literal for the '<em><b>Table Kind Id</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE__TABLE_KIND_ID = eINSTANCE.getTable_TableKindId();

-	}

-} // NattablePackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory
+ * @model kind="package"
+ *        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'"
+ * @generated
+ */
+public interface NattablePackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattable"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattable"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()
+	 * @generated
+	 */
+	int TABLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CONTEXT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__OWNER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Prototype</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__PROTOTYPE = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Table Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__TABLE_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Invert Axis</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__INVERT_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Column Axis Providers History</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__COLUMN_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Row Axis Providers History</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__ROW_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Current Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CURRENT_ROW_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Current Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CURRENT_COLUMN_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Cells</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CELLS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 12;
+
+	/**
+	 * The feature id for the '<em><b>Table Kind Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__TABLE_KIND_ID = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 13;
+
+	/**
+	 * The number of structural features of the '<em>Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 14;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table
+	 * @generated
+	 */
+	EClass getTable();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Context</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_Context();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#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()
+	 * @generated
+	 */
+	EReference getTable_Owner();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EReference getTable_Prototype();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EReference getTable_TableConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Invert Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EAttribute getTable_InvertAxis();
+
+	/**
+	 * Returns the meta object for 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EReference getTable_Cells();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_OwnedCellEditorConfigurations();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Table Kind Id</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EAttribute getTable_TableKindId();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableFactory getNattableFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()
+		 * @generated
+		 */
+		EClass TABLE = eINSTANCE.getTable();
+
+		/**
+		 * The meta object literal for the '<em><b>Context</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__CONTEXT = eINSTANCE.getTable_Context();
+
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__OWNER = eINSTANCE.getTable_Owner();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * The meta object literal for the '<em><b>Invert Axis</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE__INVERT_AXIS = eINSTANCE.getTable_InvertAxis();
+
+		/**
+		 * The meta object literal for the '<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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * The meta object literal for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTable_OwnedCellEditorConfigurations();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Kind Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE__TABLE_KIND_ID = eINSTANCE.getTable_TableKindId();
+	}
+} // NattablePackage
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 e59dd2ac037..decad9ab189 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
@@ -1,396 +1,396 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-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.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- 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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}</li>

- * </ul>

- *

- * @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-&gt;includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory-&gt;includes(currentColumnAxisProvider)' currentAxisProvidersTypes='not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"

- * @generated

- */

-public interface Table extends TableNamedElement {

-

-	/**

-	 * Returns the value of the '<em><b>Context</b></em>' reference.

-	 * <!-- 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>

-	 * <li>container of the objects created in the table</li>

-	 * </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()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getContext();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Context</em>' reference.

-	 * @see #getContext()

-	 * @generated

-	 */

-	void setContext(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Owner</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getOwner();

-

-	/**

-	 * 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.

-	 * @see #getOwner()

-	 * @generated

-	 */

-	void setOwner(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Prototype</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Prototype</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * @deprecated Use {@link Table#getTableKindId()} instead

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	EObject getPrototype();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * @deprecated Use {@link Table#setTableKindId()} instead

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Prototype</em>' reference.

-	 * @see #getPrototype()

-	 * @generated

-	 */

-	void setPrototype(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Table Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	TableConfiguration getTableConfiguration();

-

-	/**

-	 * 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.

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	void setTableConfiguration(TableConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Invert Axis</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- 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, 

-	 * 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()

-	 * @model default="false" required="true"

-	 * @generated

-	 */

-	boolean isInvertAxis();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Invert Axis</em>' attribute.

-	 * @see #isInvertAxis()

-	 * @generated

-	 */

-	void setInvertAxis(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Axis Providers History</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getColumnAxisProvidersHistory();

-

-	/**

-	 * Returns the value of the '<em><b>Row Axis Providers History</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getRowAxisProvidersHistory();

-

-	/**

-	 * Returns the value of the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model containment="true"

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

-	 * @see #getLocalRowHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model containment="true"

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

-	 * @see #getLocalColumnHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Current Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getCurrentRowAxisProvider();

-

-	/**

-	 * 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.

-	 * @see #getCurrentRowAxisProvider()

-	 * @generated

-	 */

-	void setCurrentRowAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Current Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getCurrentColumnAxisProvider();

-

-	/**

-	 * 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.

-	 * @see #getCurrentColumnAxisProvider()

-	 * @generated

-	 */

-	void setCurrentColumnAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Cells</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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"

-	 * @generated

-	 */

-	EList<Cell> getCells();

-

-	/**

-	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * In some case (Matrix Table for example), the table can have celleditor configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_OwnedCellEditorConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ICellEditorConfiguration getOwnedCellEditorConfigurations();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 */

-	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Table Kind Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Table Kind Id</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Table Kind Id</em>' attribute.

-	 * @see #setTableKindId(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableKindId()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getTableKindId();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Table Kind Id</em>' attribute.

-	 * @see #getTableKindId()

-	 * @generated

-	 */

-	void setTableKindId(String value);

-} // Table

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+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.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- 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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}</li>
+ * </ul>
+ *
+ * @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-&gt;includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory-&gt;includes(currentColumnAxisProvider)' currentAxisProvidersTypes='not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"
+ * @generated
+ */
+public interface Table extends TableNamedElement {
+
+	/**
+	 * Returns the value of the '<em><b>Context</b></em>' reference.
+	 * <!-- 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>
+	 * <li>container of the objects created in the table</li>
+	 * </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()
+	 * @model required="true"
+	 * @generated
+	 */
+	EObject getContext();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Context</em>' reference.
+	 * @see #getContext()
+	 * @generated
+	 */
+	void setContext(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	EObject getOwner();
+
+	/**
+	 * 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.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Prototype</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Prototype</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * @deprecated Use {@link Table#getTableKindId()} instead
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	EObject getPrototype();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * @deprecated Use {@link Table#setTableKindId()} instead
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Prototype</em>' reference.
+	 * @see #getPrototype()
+	 * @generated
+	 */
+	void setPrototype(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Table Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	TableConfiguration getTableConfiguration();
+
+	/**
+	 * 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.
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	void setTableConfiguration(TableConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Invert Axis</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- 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, 
+	 * 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()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isInvertAxis();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Invert Axis</em>' attribute.
+	 * @see #isInvertAxis()
+	 * @generated
+	 */
+	void setInvertAxis(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Column Axis Providers History</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getColumnAxisProvidersHistory();
+
+	/**
+	 * Returns the value of the '<em><b>Row Axis Providers History</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getRowAxisProvidersHistory();
+
+	/**
+	 * Returns the value of the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model containment="true"
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.
+	 * @see #getLocalRowHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model containment="true"
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.
+	 * @see #getLocalColumnHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Current Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	AbstractAxisProvider getCurrentRowAxisProvider();
+
+	/**
+	 * 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.
+	 * @see #getCurrentRowAxisProvider()
+	 * @generated
+	 */
+	void setCurrentRowAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Current Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	AbstractAxisProvider getCurrentColumnAxisProvider();
+
+	/**
+	 * 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.
+	 * @see #getCurrentColumnAxisProvider()
+	 * @generated
+	 */
+	void setCurrentColumnAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Cells</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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"
+	 * @generated
+	 */
+	EList<Cell> getCells();
+
+	/**
+	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * In some case (Matrix Table for example), the table can have celleditor configuration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_OwnedCellEditorConfigurations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ICellEditorConfiguration getOwnedCellEditorConfigurations();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 */
+	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Table Kind Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Table Kind Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Table Kind Id</em>' attribute.
+	 * @see #setTableKindId(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableKindId()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getTableKindId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Table Kind Id</em>' attribute.
+	 * @see #getTableKindId()
+	 * @generated
+	 */
+	void setTableKindId(String value);
+} // Table
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 668c842a833..ab5f6829dc4 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
@@ -1,106 +1,106 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-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 {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableFactory init() {

-		try {

-			NattableFactory theNattableFactory = (NattableFactory)EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);

-			if (theNattableFactory != null) {

-				return theNattableFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattablePackage.TABLE: return createTable();

-			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 Table createTable() {

-		TableImpl table = new TableImpl();

-		return table;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablePackage getNattablePackage() {

-		return (NattablePackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablePackage getPackage() {

-		return NattablePackage.eINSTANCE;

-	}

-} // NattableFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+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 {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableFactory init() {
+		try {
+			NattableFactory theNattableFactory = (NattableFactory)EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);
+			if (theNattableFactory != null) {
+				return theNattableFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattablePackage.TABLE: return createTable();
+			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 Table createTable() {
+		TableImpl table = new TableImpl();
+		return table;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablePackage getNattablePackage() {
+		return (NattablePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablePackage getPackage() {
+		return NattablePackage.eINSTANCE;
+	}
+} // NattableFactoryImpl
diff --git a/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 af5f186c870..2c4ef686d3e 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
@@ -1,510 +1,510 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableValidator;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablePackageImpl extends EPackageImpl implements NattablePackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablePackageImpl() {

-		super(eNS_URI, NattableFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattablePackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattablePackage init() {

-		if (isInited) return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		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);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-			(theNattablePackage, 

-			 new EValidator.Descriptor() {

-				 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;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTable() {

-		return tableEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_Context() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_Owner() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_Prototype() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_TableConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTable_InvertAxis() {

-		return (EAttribute)tableEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_ColumnAxisProvidersHistory() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_RowAxisProvidersHistory() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_LocalRowHeaderAxisConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_LocalColumnHeaderAxisConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_CurrentRowAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_CurrentColumnAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(10);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_Cells() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(11);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_OwnedCellEditorConfigurations() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(12);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTable_TableKindId() {

-		return (EAttribute)tableEClass.getEStructuralFeatures().get(13);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableFactory getNattableFactory() {

-		return (NattableFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		tableEClass = createEClass(TABLE);

-		createEReference(tableEClass, TABLE__CONTEXT);

-		createEReference(tableEClass, TABLE__OWNER);

-		createEReference(tableEClass, TABLE__PROTOTYPE);

-		createEReference(tableEClass, TABLE__TABLE_CONFIGURATION);

-		createEAttribute(tableEClass, TABLE__INVERT_AXIS);

-		createEReference(tableEClass, TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);

-		createEReference(tableEClass, TABLE__ROW_AXIS_PROVIDERS_HISTORY);

-		createEReference(tableEClass, TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableEClass, TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableEClass, TABLE__CURRENT_ROW_AXIS_PROVIDER);

-		createEReference(tableEClass, TABLE__CURRENT_COLUMN_AXIS_PROVIDER);

-		createEReference(tableEClass, TABLE__CELLS);

-		createEReference(tableEClass, TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS);

-		createEAttribute(tableEClass, TABLE__TABLE_KIND_ID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

-		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

-		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

-		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);

-		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI);

-		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Add subpackages

-		getESubpackages().add(theNattableconfigurationPackage);

-		getESubpackages().add(theNattableaxisproviderPackage);

-		getESubpackages().add(theNattablelabelproviderPackage);

-		getESubpackages().add(theNattableaxisconfigurationPackage);

-		getESubpackages().add(theNattabletesterPackage);

-		getESubpackages().add(theNattableaxisPackage);

-		getESubpackages().add(theNattablecellPackage);

-		getESubpackages().add(theNattableproblemPackage);

-		getESubpackages().add(theNattablestylePackage);

-		getESubpackages().add(theNattablecelleditorPackage);

-		getESubpackages().add(theNattablewrapperPackage);

-

-		// 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$

-		initEReference(getTable_Owner(), ecorePackage.getEObject(), null, "owner", 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_Prototype(), ecorePackage.getEObject(), null, "prototype", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_TableConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTable_InvertAxis(), ecorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getTable_ColumnAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProvidersHistory", 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_RowAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProvidersHistory", 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_LocalRowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localRowHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_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$

-		initEReference(getTable_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTable_TableKindId(), theEcorePackage.getEString(), "tableKindId", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Create resource

-		createResource(eNS_URI);

-

-		// Create annotations

-		// http://www.eclipse.org/OCL/Import

-		createImportAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore

-		createEcoreAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot

-		createPivotAnnotations();

-	}

-

-	/**

-	 * 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$

-		   });

-	}

-

-	/**

-	 * 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$

-		   });

-	}

-

-	/**

-	 * 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$

-		   });

-	}

-} // NattablePackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableValidator;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablePackageImpl extends EPackageImpl implements NattablePackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablePackageImpl() {
+		super(eNS_URI, NattableFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattablePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattablePackage init() {
+		if (isInited) return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		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);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Register package validator
+		EValidator.Registry.INSTANCE.put
+			(theNattablePackage, 
+			 new EValidator.Descriptor() {
+				 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;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTable() {
+		return tableEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_Context() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_Owner() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTable_Prototype() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_TableConfiguration() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTable_InvertAxis() {
+		return (EAttribute)tableEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_ColumnAxisProvidersHistory() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_RowAxisProvidersHistory() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_LocalRowHeaderAxisConfiguration() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_LocalColumnHeaderAxisConfiguration() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_CurrentRowAxisProvider() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_CurrentColumnAxisProvider() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_Cells() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTable_OwnedCellEditorConfigurations() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTable_TableKindId() {
+		return (EAttribute)tableEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableFactory getNattableFactory() {
+		return (NattableFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		tableEClass = createEClass(TABLE);
+		createEReference(tableEClass, TABLE__CONTEXT);
+		createEReference(tableEClass, TABLE__OWNER);
+		createEReference(tableEClass, TABLE__PROTOTYPE);
+		createEReference(tableEClass, TABLE__TABLE_CONFIGURATION);
+		createEAttribute(tableEClass, TABLE__INVERT_AXIS);
+		createEReference(tableEClass, TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);
+		createEReference(tableEClass, TABLE__ROW_AXIS_PROVIDERS_HISTORY);
+		createEReference(tableEClass, TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableEClass, TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableEClass, TABLE__CURRENT_ROW_AXIS_PROVIDER);
+		createEReference(tableEClass, TABLE__CURRENT_COLUMN_AXIS_PROVIDER);
+		createEReference(tableEClass, TABLE__CELLS);
+		createEReference(tableEClass, TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS);
+		createEAttribute(tableEClass, TABLE__TABLE_KIND_ID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
+		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+		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);
+		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI);
+		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Add subpackages
+		getESubpackages().add(theNattableconfigurationPackage);
+		getESubpackages().add(theNattableaxisproviderPackage);
+		getESubpackages().add(theNattablelabelproviderPackage);
+		getESubpackages().add(theNattableaxisconfigurationPackage);
+		getESubpackages().add(theNattabletesterPackage);
+		getESubpackages().add(theNattableaxisPackage);
+		getESubpackages().add(theNattablecellPackage);
+		getESubpackages().add(theNattableproblemPackage);
+		getESubpackages().add(theNattablestylePackage);
+		getESubpackages().add(theNattablecelleditorPackage);
+		getESubpackages().add(theNattablewrapperPackage);
+
+		// 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$
+		initEReference(getTable_Owner(), ecorePackage.getEObject(), null, "owner", 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_Prototype(), ecorePackage.getEObject(), null, "prototype", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_TableConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTable_InvertAxis(), ecorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getTable_ColumnAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProvidersHistory", 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_RowAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProvidersHistory", 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_LocalRowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localRowHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_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$
+		initEReference(getTable_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTable_TableKindId(), theEcorePackage.getEString(), "tableKindId", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/OCL/Import
+		createImportAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore
+		createEcoreAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot
+		createPivotAnnotations();
+	}
+
+	/**
+	 * 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$
+		   });
+	}
+
+	/**
+	 * 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$
+		   });
+	}
+
+	/**
+	 * 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$
+		   });
+	}
+} // 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 08869b7e330..811ec3dabc2 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
@@ -1,935 +1,935 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.impl;

-

-import 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.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table</b></em>'.

- * <!-- 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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableKindId <em>Table Kind Id</em>}</li>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected EObject context;

-

-	/**

-	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwner()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject owner;

-

-	/**

-	 * The cached value of the '{@link #getPrototype() <em>Prototype</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPrototype()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject prototype;

-

-	/**

-	 * The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTableConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected TableConfiguration tableConfiguration;

-

-	/**

-	 * The default value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isInvertAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean INVERT_AXIS_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isInvertAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean invertAxis = INVERT_AXIS_EDEFAULT;

-

-	/**

-	 * 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

-	 */

-	protected EList<AbstractAxisProvider> columnAxisProvidersHistory;

-

-	/**

-	 * 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

-	 */

-	protected EList<AbstractAxisProvider> rowAxisProvidersHistory;

-

-	/**

-	 * 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

-	 */

-	protected LocalTableHeaderAxisConfiguration localRowHeaderAxisConfiguration;

-

-	/**

-	 * 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

-	 */

-	protected LocalTableHeaderAxisConfiguration localColumnHeaderAxisConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getCurrentRowAxisProvider() <em>Current Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCurrentRowAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider currentRowAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getCurrentColumnAxisProvider() <em>Current Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCurrentColumnAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider currentColumnAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getCells() <em>Cells</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCells()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Cell> cells;

-

-	/**

-	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected ICellEditorConfiguration ownedCellEditorConfigurations;

-

-	/**

-	 * The default value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTableKindId()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TABLE_KIND_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTableKindId()

-	 * @generated

-	 * @ordered

-	 */

-	protected String tableKindId = TABLE_KIND_ID_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablePackage.Literals.TABLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getContext() {

-		if (context != null && context.eIsProxy()) {

-			InternalEObject oldContext = (InternalEObject)context;

-			context = eResolveProxy(oldContext);

-			if (context != oldContext) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CONTEXT, oldContext, context));

-			}

-		}

-		return context;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetContext() {

-		return context;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setContext(EObject newContext) {

-		EObject oldContext = context;

-		context = newContext;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CONTEXT, oldContext, context));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getOwner() {

-		if (owner != null && owner.eIsProxy()) {

-			InternalEObject oldOwner = (InternalEObject)owner;

-			owner = eResolveProxy(oldOwner);

-			if (owner != oldOwner) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__OWNER, oldOwner, owner));

-			}

-		}

-		return owner;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetOwner() {

-		return owner;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setOwner(EObject newOwner) {

-		EObject oldOwner = owner;

-		owner = newOwner;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNER, oldOwner, owner));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject getPrototype() {

-		if (prototype != null && prototype.eIsProxy()) {

-			InternalEObject oldPrototype = (InternalEObject)prototype;

-			prototype = eResolveProxy(oldPrototype);

-			if (prototype != oldPrototype) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));

-			}

-		}

-		return prototype;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetPrototype() {

-		return prototype;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setPrototype(EObject newPrototype) {

-		EObject oldPrototype = prototype;

-		prototype = newPrototype;

-		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()) {

-			InternalEObject oldTableConfiguration = (InternalEObject)tableConfiguration;

-			tableConfiguration = (TableConfiguration)eResolveProxy(oldTableConfiguration);

-			if (tableConfiguration != oldTableConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));

-			}

-		}

-		return tableConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableConfiguration basicGetTableConfiguration() {

-		return tableConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setTableConfiguration(TableConfiguration newTableConfiguration) {

-		TableConfiguration oldTableConfiguration = tableConfiguration;

-		tableConfiguration = newTableConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isInvertAxis() {

-		return invertAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setInvertAxis(boolean newInvertAxis) {

-		boolean oldInvertAxis = invertAxis;

-		invertAxis = newInvertAxis;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__INVERT_AXIS, oldInvertAxis, invertAxis));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getColumnAxisProvidersHistory() {

-		if (columnAxisProvidersHistory == null) {

-			columnAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);

-		}

-		return columnAxisProvidersHistory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getRowAxisProvidersHistory() {

-		if (rowAxisProvidersHistory == null) {

-			rowAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY);

-		}

-		return rowAxisProvidersHistory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration() {

-		return localRowHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration, NotificationChain msgs) {

-		LocalTableHeaderAxisConfiguration oldLocalRowHeaderAxisConfiguration = localRowHeaderAxisConfiguration;

-		localRowHeaderAxisConfiguration = newLocalRowHeaderAxisConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration) {

-		if (newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (localRowHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)localRowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration() {

-		return localColumnHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration, NotificationChain msgs) {

-		LocalTableHeaderAxisConfiguration oldLocalColumnHeaderAxisConfiguration = localColumnHeaderAxisConfiguration;

-		localColumnHeaderAxisConfiguration = newLocalColumnHeaderAxisConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration) {

-		if (newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (localColumnHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)localColumnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractAxisProvider getCurrentRowAxisProvider() {

-		if (currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {

-			InternalEObject oldCurrentRowAxisProvider = (InternalEObject)currentRowAxisProvider;

-			currentRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentRowAxisProvider);

-			if (currentRowAxisProvider != oldCurrentRowAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));

-			}

-		}

-		return currentRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetCurrentRowAxisProvider() {

-		return currentRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setCurrentRowAxisProvider(AbstractAxisProvider newCurrentRowAxisProvider) {

-		AbstractAxisProvider oldCurrentRowAxisProvider = currentRowAxisProvider;

-		currentRowAxisProvider = newCurrentRowAxisProvider;

-		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()) {

-			InternalEObject oldCurrentColumnAxisProvider = (InternalEObject)currentColumnAxisProvider;

-			currentColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentColumnAxisProvider);

-			if (currentColumnAxisProvider != oldCurrentColumnAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));

-			}

-		}

-		return currentColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetCurrentColumnAxisProvider() {

-		return currentColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setCurrentColumnAxisProvider(AbstractAxisProvider newCurrentColumnAxisProvider) {

-		AbstractAxisProvider oldCurrentColumnAxisProvider = currentColumnAxisProvider;

-		currentColumnAxisProvider = newCurrentColumnAxisProvider;

-		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) {

-			cells = new EObjectContainmentEList<Cell>(Cell.class, this, NattablePackage.TABLE__CELLS);

-		}

-		return cells;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {

-		return ownedCellEditorConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {

-		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;

-		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {

-		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {

-			NotificationChain msgs = null;

-			if (ownedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			if (newOwnedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getTableKindId() {

-		return tableKindId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setTableKindId(String newTableKindId) {

-		String oldTableKindId = tableKindId;

-		tableKindId = newTableKindId;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_KIND_ID, oldTableKindId, tableKindId));

-	}

-

-	/**

-	 * <!-- 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);

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return basicSetOwnedCellEditorConfigurations(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablePackage.TABLE__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();

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return getOwnedCellEditorConfigurations();

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				return getTableKindId();

-		}

-		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 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;

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);

-				return;

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				setTableKindId((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablePackage.TABLE__CONTEXT:

-				setContext((EObject)null);

-				return;

-			case NattablePackage.TABLE__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;

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);

-				return;

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				setTableKindId(TABLE_KIND_ID_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablePackage.TABLE__CONTEXT:

-				return context != null;

-			case NattablePackage.TABLE__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();

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return ownedCellEditorConfigurations != null;

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				return TABLE_KIND_ID_EDEFAULT == null ? tableKindId != null : !TABLE_KIND_ID_EDEFAULT.equals(tableKindId);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (invertAxis: "); //$NON-NLS-1$

-		result.append(invertAxis);

-		result.append(", tableKindId: "); //$NON-NLS-1$

-		result.append(tableKindId);

-		result.append(')');

-		return result.toString();

-	}

-} // TableImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.impl;
+
+import 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.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table</b></em>'.
+ * <!-- 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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableKindId <em>Table Kind Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected EObject context;
+
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject owner;
+
+	/**
+	 * The cached value of the '{@link #getPrototype() <em>Prototype</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPrototype()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject prototype;
+
+	/**
+	 * The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTableConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected TableConfiguration tableConfiguration;
+
+	/**
+	 * The default value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isInvertAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean INVERT_AXIS_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isInvertAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean invertAxis = INVERT_AXIS_EDEFAULT;
+
+	/**
+	 * 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
+	 */
+	protected EList<AbstractAxisProvider> columnAxisProvidersHistory;
+
+	/**
+	 * 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
+	 */
+	protected EList<AbstractAxisProvider> rowAxisProvidersHistory;
+
+	/**
+	 * 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
+	 */
+	protected LocalTableHeaderAxisConfiguration localRowHeaderAxisConfiguration;
+
+	/**
+	 * 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
+	 */
+	protected LocalTableHeaderAxisConfiguration localColumnHeaderAxisConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getCurrentRowAxisProvider() <em>Current Row Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCurrentRowAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider currentRowAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getCurrentColumnAxisProvider() <em>Current Column Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCurrentColumnAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider currentColumnAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getCells() <em>Cells</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCells()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Cell> cells;
+
+	/**
+	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected ICellEditorConfiguration ownedCellEditorConfigurations;
+
+	/**
+	 * The default value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTableKindId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TABLE_KIND_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTableKindId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String tableKindId = TABLE_KIND_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablePackage.Literals.TABLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getContext() {
+		if (context != null && context.eIsProxy()) {
+			InternalEObject oldContext = (InternalEObject)context;
+			context = eResolveProxy(oldContext);
+			if (context != oldContext) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CONTEXT, oldContext, context));
+			}
+		}
+		return context;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetContext() {
+		return context;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setContext(EObject newContext) {
+		EObject oldContext = context;
+		context = newContext;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CONTEXT, oldContext, context));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getOwner() {
+		if (owner != null && owner.eIsProxy()) {
+			InternalEObject oldOwner = (InternalEObject)owner;
+			owner = eResolveProxy(oldOwner);
+			if (owner != oldOwner) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__OWNER, oldOwner, owner));
+			}
+		}
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOwner(EObject newOwner) {
+		EObject oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNER, oldOwner, owner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject getPrototype() {
+		if (prototype != null && prototype.eIsProxy()) {
+			InternalEObject oldPrototype = (InternalEObject)prototype;
+			prototype = eResolveProxy(oldPrototype);
+			if (prototype != oldPrototype) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));
+			}
+		}
+		return prototype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetPrototype() {
+		return prototype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPrototype(EObject newPrototype) {
+		EObject oldPrototype = prototype;
+		prototype = newPrototype;
+		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()) {
+			InternalEObject oldTableConfiguration = (InternalEObject)tableConfiguration;
+			tableConfiguration = (TableConfiguration)eResolveProxy(oldTableConfiguration);
+			if (tableConfiguration != oldTableConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));
+			}
+		}
+		return tableConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableConfiguration basicGetTableConfiguration() {
+		return tableConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTableConfiguration(TableConfiguration newTableConfiguration) {
+		TableConfiguration oldTableConfiguration = tableConfiguration;
+		tableConfiguration = newTableConfiguration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isInvertAxis() {
+		return invertAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setInvertAxis(boolean newInvertAxis) {
+		boolean oldInvertAxis = invertAxis;
+		invertAxis = newInvertAxis;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__INVERT_AXIS, oldInvertAxis, invertAxis));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getColumnAxisProvidersHistory() {
+		if (columnAxisProvidersHistory == null) {
+			columnAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);
+		}
+		return columnAxisProvidersHistory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getRowAxisProvidersHistory() {
+		if (rowAxisProvidersHistory == null) {
+			rowAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY);
+		}
+		return rowAxisProvidersHistory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration() {
+		return localRowHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration, NotificationChain msgs) {
+		LocalTableHeaderAxisConfiguration oldLocalRowHeaderAxisConfiguration = localRowHeaderAxisConfiguration;
+		localRowHeaderAxisConfiguration = newLocalRowHeaderAxisConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration) {
+		if (newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (localRowHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)localRowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration() {
+		return localColumnHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration, NotificationChain msgs) {
+		LocalTableHeaderAxisConfiguration oldLocalColumnHeaderAxisConfiguration = localColumnHeaderAxisConfiguration;
+		localColumnHeaderAxisConfiguration = newLocalColumnHeaderAxisConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration) {
+		if (newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (localColumnHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)localColumnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractAxisProvider getCurrentRowAxisProvider() {
+		if (currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {
+			InternalEObject oldCurrentRowAxisProvider = (InternalEObject)currentRowAxisProvider;
+			currentRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentRowAxisProvider);
+			if (currentRowAxisProvider != oldCurrentRowAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));
+			}
+		}
+		return currentRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetCurrentRowAxisProvider() {
+		return currentRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCurrentRowAxisProvider(AbstractAxisProvider newCurrentRowAxisProvider) {
+		AbstractAxisProvider oldCurrentRowAxisProvider = currentRowAxisProvider;
+		currentRowAxisProvider = newCurrentRowAxisProvider;
+		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()) {
+			InternalEObject oldCurrentColumnAxisProvider = (InternalEObject)currentColumnAxisProvider;
+			currentColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentColumnAxisProvider);
+			if (currentColumnAxisProvider != oldCurrentColumnAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));
+			}
+		}
+		return currentColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetCurrentColumnAxisProvider() {
+		return currentColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCurrentColumnAxisProvider(AbstractAxisProvider newCurrentColumnAxisProvider) {
+		AbstractAxisProvider oldCurrentColumnAxisProvider = currentColumnAxisProvider;
+		currentColumnAxisProvider = newCurrentColumnAxisProvider;
+		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) {
+			cells = new EObjectContainmentEList<Cell>(Cell.class, this, NattablePackage.TABLE__CELLS);
+		}
+		return cells;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {
+		return ownedCellEditorConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {
+		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;
+		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {
+		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {
+			NotificationChain msgs = null;
+			if (ownedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			if (newOwnedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTableKindId() {
+		return tableKindId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTableKindId(String newTableKindId) {
+		String oldTableKindId = tableKindId;
+		tableKindId = newTableKindId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_KIND_ID, oldTableKindId, tableKindId));
+	}
+
+	/**
+	 * <!-- 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);
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return basicSetOwnedCellEditorConfigurations(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablePackage.TABLE__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();
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return getOwnedCellEditorConfigurations();
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				return getTableKindId();
+		}
+		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 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;
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);
+				return;
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				setTableKindId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablePackage.TABLE__CONTEXT:
+				setContext((EObject)null);
+				return;
+			case NattablePackage.TABLE__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;
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);
+				return;
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				setTableKindId(TABLE_KIND_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablePackage.TABLE__CONTEXT:
+				return context != null;
+			case NattablePackage.TABLE__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();
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return ownedCellEditorConfigurations != null;
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				return TABLE_KIND_ID_EDEFAULT == null ? tableKindId != null : !TABLE_KIND_ID_EDEFAULT.equals(tableKindId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (invertAxis: "); //$NON-NLS-1$
+		result.append(invertAxis);
+		result.append(", tableKindId: "); //$NON-NLS-1$
+		result.append(tableKindId);
+		result.append(')');
+		return result.toString();
+	}
+} // TableImpl
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 b6a4c536f73..204c70f0adf 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
@@ -1,49 +1,49 @@
-/**

- * 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.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Group</b></em>'.

- * <!-- end-user-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup()

- * @model

- * @generated

- */

-public interface AxisGroup extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Grouped Axis</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @generated

-	 */

-	EList<IAxis> getGroupedAxis();

-} // AxisGroup

+/**
+ * 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.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Group</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup()
+ * @model
+ * @generated
+ */
+public interface AxisGroup extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Grouped Axis</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @generated
+	 */
+	EList<IAxis> getGroupedAxis();
+} // AxisGroup
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 bcc050bebf0..fbe07f91f68 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
@@ -1,60 +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.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EObject Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis()

- * @model

- * @generated

- */

-public interface EObjectAxis extends ObjectAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	EObject getElement();

-

-	/**

-	 * 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.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(EObject value);

-} // EObjectAxis

+/**
+ * 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.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EObject Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis()
+ * @model
+ * @generated
+ */
+public interface EObjectAxis extends ObjectAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	EObject getElement();
+
+	/**
+	 * 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.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(EObject value);
+} // EObjectAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
index 117b10395f2..b05d1565311 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * 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>EObject Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectTreeItemAxis()

- * @model

- * @generated

- */

-public interface EObjectTreeItemAxis extends EObjectAxis, ITreeItemAxis {

-} // EObjectTreeItemAxis

+/**
+ * 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>EObject Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface EObjectTreeItemAxis extends EObjectAxis, ITreeItemAxis {
+} // EObjectTreeItemAxis
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
index c86e6ac7f7f..f76c36030e1 100644
--- 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
@@ -1,64 +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

+/**
+ * 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
index 29bc8f35e2b..a04fefe7aa5 100644
--- 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
@@ -1,27 +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

+/**
+ * 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 07d9264eab4..f44d81ca9f9 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
@@ -1,64 +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.EStructuralFeature;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EStructural Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to reference EMF EStructuralFeature.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis()

- * @model

- * @generated

- */

-public interface EStructuralFeatureAxis extends FeatureAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	EStructuralFeature getElement();

-

-	/**

-	 * 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.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(EStructuralFeature value);

-} // EStructuralFeatureAxis

+/**
+ * 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.EStructuralFeature;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EStructural Feature Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * IAxis used to reference EMF EStructuralFeature.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis()
+ * @model
+ * @generated
+ */
+public interface EStructuralFeatureAxis extends FeatureAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	EStructuralFeature getElement();
+
+	/**
+	 * 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.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(EStructuralFeature value);
+} // EStructuralFeatureAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
index 52d28a7e135..0ec1c879dfc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * 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>EStructural Feature Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureTreeItemAxis()

- * @model

- * @generated

- */

-public interface EStructuralFeatureTreeItemAxis extends EStructuralFeatureAxis, ITreeItemAxis {

-} // EStructuralFeatureTreeItemAxis

+/**
+ * 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>EStructural Feature Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface EStructuralFeatureTreeItemAxis extends EStructuralFeatureAxis, ITreeItemAxis {
+} // EStructuralFeatureTreeItemAxis
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 aab93520e61..0186e0cc3ae 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
@@ -1,65 +1,65 @@
-/**

- * 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.FeatureLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class used to reference features.

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis()

- * @model abstract="true"

- * @generated

- */

-public interface FeatureAxis extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model containment="true"

-	 * @generated

-	 */

-	@Override

-	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.

-	 * <!-- 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(FeatureLabelProviderConfiguration value);

-} // FeatureAxis

+/**
+ * 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.FeatureLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract class used to reference features.
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface FeatureAxis extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model containment="true"
+	 * @generated
+	 */
+	@Override
+	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.
+	 * <!-- 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(FeatureLabelProviderConfiguration value);
+} // FeatureAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
index 4574dede408..4b9e15ad0a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
@@ -1,30 +1,30 @@
-/**

- * 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>Feature Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to represent feature using a string.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdAxis()

- * @model

- * @generated

- */

-public interface FeatureIdAxis extends IdAxis, FeatureAxis {

-} // FeatureIdAxis

+/**
+ * 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>Feature Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * IAxis used to represent feature using a string.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdAxis()
+ * @model
+ * @generated
+ */
+public interface FeatureIdAxis extends IdAxis, FeatureAxis {
+} // FeatureIdAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
index 8f4078a4988..1bedbc30ccb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * 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>Feature Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdTreeItemAxis()

- * @model

- * @generated

- */

-public interface FeatureIdTreeItemAxis extends FeatureIdAxis, ITreeItemAxis {

-} // FeatureIdTreeItemAxis

+/**
+ * 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>Feature Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface FeatureIdTreeItemAxis extends FeatureIdAxis, ITreeItemAxis {
+} // FeatureIdTreeItemAxis
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 25826859e94..55730b3777d 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
@@ -1,26 +1,26 @@
-/**

- * 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>Feature Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureTreeItemAxis()

- * @model abstract="true"

- * @generated

- */

-public interface FeatureTreeItemAxis extends FeatureAxis, ITreeItemAxis {

-} // FeatureTreeItemAxis

+/**
+ * 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>Feature Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureTreeItemAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface FeatureTreeItemAxis extends FeatureAxis, ITreeItemAxis {
+} // FeatureTreeItemAxis
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 79ea7e9c8ae..c00b4e21714 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
@@ -1,114 +1,114 @@
-/**

- * 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.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IAxis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Common interface for the axis of the table. (An axis is a specific row or a specific column)

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IAxis extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	AxisManagerRepresentation getManager();

-

-	/**

-	 * 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.

-	 * @see #getManager()

-	 * @generated

-	 */

-	void setManager(AxisManagerRepresentation value);

-

-	/**

-	 * Returns the value of the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	String getAlias();

-

-	/**

-	 * 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.

-	 * @see #getAlias()

-	 * @generated

-	 */

-	void setAlias(String value);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the elements represented by the IAxis

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getElement();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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

-	 */

-	ILabelProviderConfiguration getLocalLabelConfiguration();

-} // IAxis

+/**
+ * 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.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IAxis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Common interface for the axis of the table. (An axis is a specific row or a specific column)
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IAxis extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	AxisManagerRepresentation getManager();
+
+	/**
+	 * 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.
+	 * @see #getManager()
+	 * @generated
+	 */
+	void setManager(AxisManagerRepresentation value);
+
+	/**
+	 * Returns the value of the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	String getAlias();
+
+	/**
+	 * 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.
+	 * @see #getAlias()
+	 * @generated
+	 */
+	void setAlias(String value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Returns the elements represented by the IAxis
+	 * <!-- end-model-doc -->
+	 * @model kind="operation"
+	 * @generated
+	 */
+	Object getElement();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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
+	 */
+	ILabelProviderConfiguration getLocalLabelConfiguration();
+} // IAxis
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 64ecbb59a26..b794f04b6f3 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
@@ -1,106 +1,106 @@
-/**

- * 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.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ITree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis()

- * @model interface="true" abstract="true"

- * @generated

- */

-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>}'.

-	 * <!-- 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()

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren

-	 * @model opposite="children"

-	 * @generated

-	 */

-	ITreeItemAxis getParent();

-

-	/**

-	 * 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.

-	 * @see #getParent()

-	 * @generated

-	 */

-	void setParent(ITreeItemAxis value);

-

-	/**

-	 * Returns the value of the '<em><b>Expanded</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="false" required="true" transient="true"

-	 * @generated

-	 */

-	boolean isExpanded();

-

-	/**

-	 * 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.

-	 * @see #isExpanded()

-	 * @generated

-	 */

-	void setExpanded(boolean value);

-

-	/**

-	 * 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>}'.

-	 * <!-- 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

-	 * @model opposite="parent" derived="true"

-	 * @generated

-	 */

-	EList<ITreeItemAxis> getChildren();

-} // ITreeItemAxis

+/**
+ * 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.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ITree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+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>}'.
+	 * <!-- 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()
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren
+	 * @model opposite="children"
+	 * @generated
+	 */
+	ITreeItemAxis getParent();
+
+	/**
+	 * 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.
+	 * @see #getParent()
+	 * @generated
+	 */
+	void setParent(ITreeItemAxis value);
+
+	/**
+	 * Returns the value of the '<em><b>Expanded</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="false" required="true" transient="true"
+	 * @generated
+	 */
+	boolean isExpanded();
+
+	/**
+	 * 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.
+	 * @see #isExpanded()
+	 * @generated
+	 */
+	void setExpanded(boolean value);
+
+	/**
+	 * 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>}'.
+	 * <!-- 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
+	 * @model opposite="parent" derived="true"
+	 * @generated
+	 */
+	EList<ITreeItemAxis> getChildren();
+} // ITreeItemAxis
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 0beb1461acd..7a975d36334 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
@@ -1,58 +1,58 @@
-/**

- * 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>Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis()

- * @model abstract="true"

- * @generated

- */

-public interface IdAxis extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	String getElement();

-

-	/**

-	 * 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.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(String value);

-} // IdAxis

+/**
+ * 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>Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface IdAxis extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	String getElement();
+
+	/**
+	 * 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.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(String value);
+} // IdAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
index fe7e6018b24..4ba27cd754e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * 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>Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdTreeItemAxis()

- * @model

- * @generated

- */

-public interface IdTreeItemAxis extends IdAxis, ITreeItemAxis {

-} // IdTreeItemAxis

+/**
+ * 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>Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface IdTreeItemAxis extends IdAxis, ITreeItemAxis {
+} // IdTreeItemAxis
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 08d4083449a..fb35e886187 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
@@ -1,151 +1,151 @@
-/**

- * 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.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

- * @generated

- */

-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();

-

-	/**

-	 * 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

-	 */

-	IdTreeItemAxis createIdTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>EObject Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject Axis</em>'.

-	 * @generated

-	 */

-	EObjectAxis createEObjectAxis();

-

-	/**

-	 * Returns 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 Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Feature Id Axis</em>'.

-	 * @generated

-	 */

-	FeatureIdAxis createFeatureIdAxis();

-

-	/**

-	 * 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

-	 */

-	FeatureIdTreeItemAxis createFeatureIdTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	ObjectIdAxis createObjectIdAxis();

-

-	/**

-	 * 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

-	 */

-	ObjectIdTreeItemAxis createObjectIdTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	AxisGroup createAxisGroup();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableaxisPackage getNattableaxisPackage();

-} // NattableaxisFactory

+/**
+ * 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.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage
+ * @generated
+ */
+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();
+
+	/**
+	 * 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
+	 */
+	IdTreeItemAxis createIdTreeItemAxis();
+
+	/**
+	 * Returns a new object of class '<em>EObject Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EObject Axis</em>'.
+	 * @generated
+	 */
+	EObjectAxis createEObjectAxis();
+
+	/**
+	 * Returns 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 Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Feature Id Axis</em>'.
+	 * @generated
+	 */
+	FeatureIdAxis createFeatureIdAxis();
+
+	/**
+	 * 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
+	 */
+	FeatureIdTreeItemAxis createFeatureIdTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	ObjectIdAxis createObjectIdAxis();
+
+	/**
+	 * 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
+	 */
+	ObjectIdTreeItemAxis createObjectIdTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	AxisGroup createAxisGroup();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableaxisPackage getNattableaxisPackage();
+} // NattableaxisFactory
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 8a18c4c246d..6b403f027b8 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
@@ -1,3808 +1,3808 @@
-/**

- * 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.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory

- * @model kind="package"

- * @generated

- */

-public interface NattableaxisPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableaxis"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableaxis"; //$NON-NLS-1$

-

-	/**

-	 * 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();

-

-	/**

-	 * 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

-	 */

-	int IAXIS = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__MANAGER = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__ALIAS = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>IAxis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_ELEMENT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_LOCAL_LABEL_CONFIGURATION = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int ITREE_ITEM_AXIS = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_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 ITREE_ITEM_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__PARENT = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__EXPANDED = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__CHILDREN = IAXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>ITree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>ITree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * 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

-	 */

-	int ID_AXIS = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_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 ID_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 ID_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 ID_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 ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int ID_TREE_ITEM_AXIS = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__STYLES = ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__MANAGER = ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__ALIAS = ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__ELEMENT = ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__PARENT = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__EXPANDED = ID_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 ID_TREE_ITEM_AXIS__CHILDREN = ID_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_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 ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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 = 10;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_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 OBJECT_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_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 OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Object Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int EOBJECT_AXIS = 4;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__STYLES = OBJECT_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__MANAGER = OBJECT_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__ALIAS = OBJECT_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 EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__ELEMENT = OBJECT_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_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 EOBJECT_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int EOBJECT_TREE_ITEM_AXIS = 5;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__EANNOTATIONS = EOBJECT_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__STYLES = EOBJECT_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__MANAGER = EOBJECT_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__ALIAS = EOBJECT_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 EOBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__ELEMENT = EOBJECT_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__PARENT = EOBJECT_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__EXPANDED = EOBJECT_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 EOBJECT_TREE_ITEM_AXIS__CHILDREN = EOBJECT_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>EObject Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = EOBJECT_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = EOBJECT_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = EOBJECT_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 EOBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = EOBJECT_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = EOBJECT_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_ELEMENT = EOBJECT_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int FEATURE_AXIS = 6;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_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 FEATURE_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_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 FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.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 = 8;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__STYLES = FEATURE_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__MANAGER = FEATURE_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__ALIAS = FEATURE_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 FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__PARENT = FEATURE_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__EXPANDED = FEATURE_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 FEATURE_TREE_ITEM_AXIS__CHILDREN = FEATURE_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Feature Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_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 FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.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 = 11;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__STYLES = OBJECT_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__MANAGER = OBJECT_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__ALIAS = OBJECT_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 OBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__PARENT = OBJECT_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__EXPANDED = OBJECT_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 OBJECT_TREE_ITEM_AXIS__CHILDREN = OBJECT_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Object Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_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 OBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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 = 12;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__STYLES = ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__MANAGER = ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__ALIAS = ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Feature Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_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 FEATURE_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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 = 13;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__STYLES = FEATURE_ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__MANAGER = FEATURE_ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__ALIAS = FEATURE_ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__ELEMENT = FEATURE_ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__PARENT = FEATURE_ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__EXPANDED = FEATURE_ID_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 FEATURE_ID_TREE_ITEM_AXIS__CHILDREN = FEATURE_ID_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Feature Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_ID_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_ID_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 FEATURE_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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 = 14;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__STYLES = FEATURE_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__MANAGER = FEATURE_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__ALIAS = FEATURE_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 ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__ELEMENT = FEATURE_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EStructural Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_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 ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.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 = 16;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__STYLES = ESTRUCTURAL_FEATURE_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__MANAGER = ESTRUCTURAL_FEATURE_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ALIAS = ESTRUCTURAL_FEATURE_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 ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ELEMENT = ESTRUCTURAL_FEATURE_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED = ESTRUCTURAL_FEATURE_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 ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>EStructural Feature Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ESTRUCTURAL_FEATURE_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 ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.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 = 18;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__STYLES = ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__MANAGER = ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__ALIAS = ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Object Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_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 OBJECT_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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 = 19;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__STYLES = OBJECT_ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__MANAGER = OBJECT_ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__ALIAS = OBJECT_ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__ELEMENT = OBJECT_ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__PARENT = OBJECT_ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__EXPANDED = OBJECT_ID_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 OBJECT_ID_TREE_ITEM_AXIS__CHILDREN = OBJECT_ID_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Object Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_ID_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_ID_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 OBJECT_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * 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.

-	 * <!-- 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 = 20;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__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 AXIS_GROUP__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Grouped Axis</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__GROUPED_AXIS = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Axis Group</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP_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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Axis Group</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * 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

-	 */

-	EClass getIAxis();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EReference getIAxis_Manager();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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.

-	 * <!-- 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

-	 */

-	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.

-	 * <!-- 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

-	 */

-	EOperation getIAxis__GetLocalLabelConfiguration();

-

-	/**

-	 * 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

-	 */

-	EClass getITreeItemAxis();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EReference getITreeItemAxis_Parent();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EReference getITreeItemAxis_Children();

-

-	/**

-	 * 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

-	 */

-	EClass getIdAxis();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	EClass getIdTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	EClass getEObjectAxis();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	EClass getEObjectTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EReference getFeatureAxis_LocalLabelConfiguration();

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	EClass getObjectTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	EClass getFeatureIdTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	EClass getEStructuralFeatureAxis();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EReference getEStructuralFeatureAxis_Element();

-

-	/**

-	 * 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

-	 */

-	EClass getEStructuralFeatureTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	EClass getObjectIdTreeItemAxis();

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EReference getAxisGroup_GroupedAxis();

-

-	/**

-	 * 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

-	 */

-	NattableaxisFactory getNattableaxisFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-		 */

-		EClass IAXIS = eINSTANCE.getIAxis();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation IAXIS___GET_ELEMENT = eINSTANCE.getIAxis__GetElement();

-

-		/**

-		 * The meta object literal for the '<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.

-		 * <!-- 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

-		 */

-		EClass ITREE_ITEM_AXIS = eINSTANCE.getITreeItemAxis();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass ID_AXIS = eINSTANCE.getIdAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ID_AXIS__ELEMENT = eINSTANCE.getIdAxis_Element();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass EOBJECT_AXIS = eINSTANCE.getEObjectAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOBJECT_AXIS__ELEMENT = eINSTANCE.getEObjectAxis_Element();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass FEATURE_AXIS = eINSTANCE.getFeatureAxis();

-

-		/**

-		 * 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.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

-		 */

-		EClass FEATURE_TREE_ITEM_AXIS = eINSTANCE.getFeatureTreeItemAxis();

-

-		/**

-		 * 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

-		 */

-		EClass OBJECT_AXIS = eINSTANCE.getObjectAxis();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass ESTRUCTURAL_FEATURE_AXIS = eINSTANCE.getEStructuralFeatureAxis();

-

-		/**

-		 * 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.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

-		 */

-		EClass ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = eINSTANCE.getEStructuralFeatureTreeItemAxis();

-

-		/**

-		 * 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass AXIS_GROUP = eINSTANCE.getAxisGroup();

-

-		/**

-		 * 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();

-	}

-} // NattableaxisPackage

+/**
+ * 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.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattableaxisPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableaxis"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableaxis"; //$NON-NLS-1$
+
+	/**
+	 * 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();
+
+	/**
+	 * 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
+	 */
+	int IAXIS = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__MANAGER = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__ALIAS = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>IAxis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_ELEMENT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_LOCAL_LABEL_CONFIGURATION = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int ITREE_ITEM_AXIS = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_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 ITREE_ITEM_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__PARENT = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__EXPANDED = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__CHILDREN = IAXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>ITree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_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 ITREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>ITree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * 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
+	 */
+	int ID_AXIS = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_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 ID_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 ID_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 ID_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 ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int ID_TREE_ITEM_AXIS = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__STYLES = ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__MANAGER = ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__ALIAS = ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__ELEMENT = ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__PARENT = ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__EXPANDED = ID_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 ID_TREE_ITEM_AXIS__CHILDREN = ID_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_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 ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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 = 10;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_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 OBJECT_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_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 OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Object Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_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 OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int EOBJECT_AXIS = 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__STYLES = OBJECT_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__MANAGER = OBJECT_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__ALIAS = OBJECT_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 EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__ELEMENT = OBJECT_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_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 EOBJECT_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int EOBJECT_TREE_ITEM_AXIS = 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__EANNOTATIONS = EOBJECT_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__STYLES = EOBJECT_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__MANAGER = EOBJECT_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__ALIAS = EOBJECT_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 EOBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__ELEMENT = EOBJECT_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__PARENT = EOBJECT_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__EXPANDED = EOBJECT_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 EOBJECT_TREE_ITEM_AXIS__CHILDREN = EOBJECT_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>EObject Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = EOBJECT_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = EOBJECT_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = EOBJECT_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 EOBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = EOBJECT_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = EOBJECT_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_ELEMENT = EOBJECT_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int FEATURE_AXIS = 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_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 FEATURE_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_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 FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Feature Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_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 FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.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 = 8;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__STYLES = FEATURE_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__MANAGER = FEATURE_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__ALIAS = FEATURE_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 FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__PARENT = FEATURE_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__EXPANDED = FEATURE_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 FEATURE_TREE_ITEM_AXIS__CHILDREN = FEATURE_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Feature Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_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 FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.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 = 11;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__STYLES = OBJECT_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__MANAGER = OBJECT_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__ALIAS = OBJECT_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 OBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__PARENT = OBJECT_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__EXPANDED = OBJECT_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 OBJECT_TREE_ITEM_AXIS__CHILDREN = OBJECT_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Object Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_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 OBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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 = 12;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__STYLES = ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__MANAGER = ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__ALIAS = ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Feature Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_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 FEATURE_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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 = 13;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__STYLES = FEATURE_ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__MANAGER = FEATURE_ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__ALIAS = FEATURE_ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__ELEMENT = FEATURE_ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__PARENT = FEATURE_ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__EXPANDED = FEATURE_ID_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 FEATURE_ID_TREE_ITEM_AXIS__CHILDREN = FEATURE_ID_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Feature Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_ID_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_ID_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 FEATURE_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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 = 14;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__STYLES = FEATURE_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__MANAGER = FEATURE_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__ALIAS = FEATURE_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 ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__ELEMENT = FEATURE_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EStructural Feature Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_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 ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.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 = 16;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__STYLES = ESTRUCTURAL_FEATURE_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__MANAGER = ESTRUCTURAL_FEATURE_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ALIAS = ESTRUCTURAL_FEATURE_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 ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ELEMENT = ESTRUCTURAL_FEATURE_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED = ESTRUCTURAL_FEATURE_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 ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>EStructural Feature Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ESTRUCTURAL_FEATURE_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 ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.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 = 18;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__STYLES = ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__MANAGER = ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__ALIAS = ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Object Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_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 OBJECT_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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 = 19;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__STYLES = OBJECT_ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__MANAGER = OBJECT_ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__ALIAS = OBJECT_ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__ELEMENT = OBJECT_ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__PARENT = OBJECT_ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__EXPANDED = OBJECT_ID_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 OBJECT_ID_TREE_ITEM_AXIS__CHILDREN = OBJECT_ID_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Object Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_ID_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_ID_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 OBJECT_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * 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.
+	 * <!-- 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 = 20;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__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 AXIS_GROUP__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Grouped Axis</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__GROUPED_AXIS = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Axis Group</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP_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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___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 AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Axis Group</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * 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
+	 */
+	EClass getIAxis();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EReference getIAxis_Manager();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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.
+	 * <!-- 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
+	 */
+	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.
+	 * <!-- 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
+	 */
+	EOperation getIAxis__GetLocalLabelConfiguration();
+
+	/**
+	 * 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
+	 */
+	EClass getITreeItemAxis();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EReference getITreeItemAxis_Parent();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EReference getITreeItemAxis_Children();
+
+	/**
+	 * 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
+	 */
+	EClass getIdAxis();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	EClass getIdTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	EClass getEObjectAxis();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	EClass getEObjectTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EReference getFeatureAxis_LocalLabelConfiguration();
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	EClass getObjectTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	EClass getFeatureIdTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	EClass getEStructuralFeatureAxis();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EReference getEStructuralFeatureAxis_Element();
+
+	/**
+	 * 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
+	 */
+	EClass getEStructuralFeatureTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	EClass getObjectIdTreeItemAxis();
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EReference getAxisGroup_GroupedAxis();
+
+	/**
+	 * 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
+	 */
+	NattableaxisFactory getNattableaxisFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+		 */
+		EClass IAXIS = eINSTANCE.getIAxis();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation IAXIS___GET_ELEMENT = eINSTANCE.getIAxis__GetElement();
+
+		/**
+		 * The meta object literal for the '<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.
+		 * <!-- 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
+		 */
+		EClass ITREE_ITEM_AXIS = eINSTANCE.getITreeItemAxis();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass ID_AXIS = eINSTANCE.getIdAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ID_AXIS__ELEMENT = eINSTANCE.getIdAxis_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass EOBJECT_AXIS = eINSTANCE.getEObjectAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EOBJECT_AXIS__ELEMENT = eINSTANCE.getEObjectAxis_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass FEATURE_AXIS = eINSTANCE.getFeatureAxis();
+
+		/**
+		 * 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.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
+		 */
+		EClass FEATURE_TREE_ITEM_AXIS = eINSTANCE.getFeatureTreeItemAxis();
+
+		/**
+		 * 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
+		 */
+		EClass OBJECT_AXIS = eINSTANCE.getObjectAxis();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass ESTRUCTURAL_FEATURE_AXIS = eINSTANCE.getEStructuralFeatureAxis();
+
+		/**
+		 * 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.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
+		 */
+		EClass ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = eINSTANCE.getEStructuralFeatureTreeItemAxis();
+
+		/**
+		 * 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass AXIS_GROUP = eINSTANCE.getAxisGroup();
+
+		/**
+		 * 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();
+	}
+} // NattableaxisPackage
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 eee90c52545..38901a9e8d0 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
@@ -1,65 +1,65 @@
-/**

- * 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.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class used to reference object

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis()

- * @model abstract="true"

- * @generated

- */

-public interface ObjectAxis extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model containment="true"

-	 * @generated

-	 */

-	@Override

-	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.

-	 * <!-- 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(ObjectLabelProviderConfiguration value);

-} // ObjectAxis

+/**
+ * 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.ObjectLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Object Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract class used to reference object
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ObjectAxis extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model containment="true"
+	 * @generated
+	 */
+	@Override
+	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.
+	 * <!-- 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(ObjectLabelProviderConfiguration value);
+} // ObjectAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
index 5ca5862a0e0..a3765ff9add 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
@@ -1,30 +1,30 @@
-/**

- * 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>Object Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to represent object using a string.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdAxis()

- * @model

- * @generated

- */

-public interface ObjectIdAxis extends IdAxis, ObjectAxis {

-} // ObjectIdAxis

+/**
+ * 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>Object Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * IAxis used to represent object using a string.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdAxis()
+ * @model
+ * @generated
+ */
+public interface ObjectIdAxis extends IdAxis, ObjectAxis {
+} // ObjectIdAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
index 82131b34d84..9b5ca8af0ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * 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>Object Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdTreeItemAxis()

- * @model

- * @generated

- */

-public interface ObjectIdTreeItemAxis extends ObjectIdAxis, ITreeItemAxis {

-} // ObjectIdTreeItemAxis

+/**
+ * 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>Object Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface ObjectIdTreeItemAxis extends ObjectIdAxis, ITreeItemAxis {
+} // ObjectIdTreeItemAxis
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 241b335639d..4277a6c6f82 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
@@ -1,26 +1,26 @@
-/**

- * 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>Object Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectTreeItemAxis()

- * @model abstract="true"

- * @generated

- */

-public interface ObjectTreeItemAxis extends ObjectAxis, ITreeItemAxis {

-} // ObjectTreeItemAxis

+/**
+ * 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>Object Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectTreeItemAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ObjectTreeItemAxis extends ObjectAxis, ITreeItemAxis {
+} // ObjectTreeItemAxis
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
index 2493434f7e9..6d056b813dc 100644
--- 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
@@ -1,60 +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

+/**
+ * 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
index 773810964e7..0013753205c 100644
--- 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
@@ -1,27 +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

+/**
+ * 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 8befb6e71bd..f4e7a184718 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
@@ -1,319 +1,319 @@
-/**

- * 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 java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-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.EObjectResolvingEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-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.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Group</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	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 #getGroupedAxis() <em>Grouped Axis</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getGroupedAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxis> groupedAxis;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisGroupImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.AXIS_GROUP;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.AXIS_GROUP__MANAGER, oldManager, manager));

-			}

-		}

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetManager() {

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		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) {

-			groupedAxis = new EObjectResolvingEList<IAxis>(IAxis.class, this, NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS);

-		}

-		return groupedAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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 ILabelProviderConfiguration getLocalLabelConfiguration() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.AXIS_GROUP___GET_ELEMENT:

-				return getElement();

-			case NattableaxisPackage.AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		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();

-	}

-} // AxisGroupImpl

+/**
+ * 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 java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+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.EObjectResolvingEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;
+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.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Group</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	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 #getGroupedAxis() <em>Grouped Axis</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGroupedAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxis> groupedAxis;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisGroupImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.AXIS_GROUP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.AXIS_GROUP__MANAGER, oldManager, manager));
+			}
+		}
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetManager() {
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		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) {
+			groupedAxis = new EObjectResolvingEList<IAxis>(IAxis.class, this, NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS);
+		}
+		return groupedAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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 ILabelProviderConfiguration getLocalLabelConfiguration() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.AXIS_GROUP___GET_ELEMENT:
+				return getElement();
+			case NattableaxisPackage.AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		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();
+	}
+} // AxisGroupImpl
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 a7510e99210..327cb87f33a 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
@@ -1,165 +1,165 @@
-/**

- * 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.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EObject 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.EObjectAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected EObject element;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.EOBJECT_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getElement() {

-		if (element != null && element.eIsProxy()) {

-			InternalEObject oldElement = (InternalEObject)element;

-			element = eResolveProxy(oldElement);

-			if (element != oldElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));

-			}

-		}

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(EObject newElement) {

-		EObject oldElement = element;

-		element = newElement;

-		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();

-		}

-		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.EOBJECT_AXIS__ELEMENT:

-				setElement((EObject)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-				setElement((EObject)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-				return element != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EObjectAxisImpl

+/**
+ * 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.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EObject 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.EObjectAxisImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected EObject element;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.EOBJECT_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getElement() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject)element;
+			element = eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));
+			}
+		}
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(EObject newElement) {
+		EObject oldElement = element;
+		element = newElement;
+		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();
+		}
+		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.EOBJECT_AXIS__ELEMENT:
+				setElement((EObject)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
+				setElement((EObject)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
+				return element != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EObjectAxisImpl
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 a6c0c82d061..2c2965256f6 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
@@ -1,370 +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.EObjectTreeItemAxis;

-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>EObject 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.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>

- *

- * @generated

- */

-public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectTreeItemAxis {

-

-	/**

-	 * 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 EObjectTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.EOBJECT_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.EOBJECT_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.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.EOBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		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) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOBJECT_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.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);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		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();

-	}

-} // EObjectTreeItemAxisImpl

+/**
+ * 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.EObjectTreeItemAxis;
+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>EObject 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.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>
+ *
+ * @generated
+ */
+public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectTreeItemAxis {
+
+	/**
+	 * 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 EObjectTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.EOBJECT_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.EOBJECT_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.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.EOBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		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) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOBJECT_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.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);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		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();
+	}
+} // EObjectTreeItemAxisImpl
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
index 767f8d412cf..7c3ccbf7133 100644
--- 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
@@ -1,166 +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

+/**
+ * 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
index 5f6079a6d6e..ab25ac01b1c 100644
--- 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
@@ -1,370 +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

+/**
+ * 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 4258ca8f397..1162810be3f 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
@@ -1,165 +1,165 @@
-/**

- * 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.EStructuralFeature;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EStructural Feature 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.EStructuralFeatureAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStructuralFeatureAxis {

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EStructuralFeature element;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeature getElement() {

-		if (element != null && element.eIsProxy()) {

-			InternalEObject oldElement = (InternalEObject)element;

-			element = (EStructuralFeature)eResolveProxy(oldElement);

-			if (element != oldElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));

-			}

-		}

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeature basicGetElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(EStructuralFeature newElement) {

-		EStructuralFeature oldElement = element;

-		element = newElement;

-		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();

-		}

-		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.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-				setElement((EStructuralFeature)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-				return element != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EStructuralFeatureAxisImpl

+/**
+ * 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.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EStructural Feature 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.EStructuralFeatureAxisImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStructuralFeatureAxis {
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EStructuralFeature element;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeature getElement() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject)element;
+			element = (EStructuralFeature)eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));
+			}
+		}
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeature basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(EStructuralFeature newElement) {
+		EStructuralFeature oldElement = element;
+		element = newElement;
+		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();
+		}
+		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.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
+				setElement((EStructuralFeature)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
+				return element != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EStructuralFeatureAxisImpl
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 2a50029a308..a8c2d99fd83 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
@@ -1,370 +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.EStructuralFeatureTreeItemAxis;

-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>EStructural Feature 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.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>

- *

- * @generated

- */

-public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisImpl implements EStructuralFeatureTreeItemAxis {

-

-	/**

-	 * 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 EStructuralFeatureTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.ESTRUCTURAL_FEATURE_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.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		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) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ESTRUCTURAL_FEATURE_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.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);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		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();

-	}

-} // EStructuralFeatureTreeItemAxisImpl

+/**
+ * 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.EStructuralFeatureTreeItemAxis;
+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>EStructural Feature 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.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>
+ *
+ * @generated
+ */
+public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisImpl implements EStructuralFeatureTreeItemAxis {
+
+	/**
+	 * 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 EStructuralFeatureTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.ESTRUCTURAL_FEATURE_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.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		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) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ESTRUCTURAL_FEATURE_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.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);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		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();
+	}
+} // EStructuralFeatureTreeItemAxisImpl
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 58b3e16de87..520ea82dc3f 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
@@ -1,347 +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.FeatureAxis;

-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.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature 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.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>

- *

- * @generated

- */

-public abstract class FeatureAxisImpl extends StyledElementImpl implements FeatureAxis {

-

-	/**

-	 * 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 FeatureLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.FEATURE_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

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.FEATURE_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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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.FEATURE_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();

-	}

-} // FeatureAxisImpl

+/**
+ * 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.FeatureAxis;
+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.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature 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.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>
+ *
+ * @generated
+ */
+public abstract class FeatureAxisImpl extends StyledElementImpl implements FeatureAxis {
+
+	/**
+	 * 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 FeatureLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.FEATURE_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
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.FEATURE_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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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.FEATURE_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();
+	}
+} // FeatureAxisImpl
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 1b847672593..f8fd8950afd 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
@@ -1,217 +1,217 @@
-/**

- * 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.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Id 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.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected FeatureLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureIdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.FEATURE_ID_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.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-} // FeatureIdAxisImpl

+/**
+ * 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.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Id 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.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected FeatureLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureIdAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_ID_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.FEATURE_ID_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.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+} // FeatureIdAxisImpl
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 b0584714cd7..9044def68e4 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
@@ -1,370 +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.FeatureIdTreeItemAxis;

-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>Feature Id 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.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>

- *

- * @generated

- */

-public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements FeatureIdTreeItemAxis {

-

-	/**

-	 * 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 FeatureIdTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_ID_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.FEATURE_ID_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.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.FEATURE_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		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) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_ID_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.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);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		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();

-	}

-} // FeatureIdTreeItemAxisImpl

+/**
+ * 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.FeatureIdTreeItemAxis;
+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>Feature Id 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.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>
+ *
+ * @generated
+ */
+public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements FeatureIdTreeItemAxis {
+
+	/**
+	 * 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 FeatureIdTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_ID_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.FEATURE_ID_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.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.FEATURE_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		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) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_ID_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.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);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		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();
+	}
+} // FeatureIdTreeItemAxisImpl
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 207b6956833..ffeddd08f23 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
@@ -1,370 +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.FeatureTreeItemAxis;

-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>Feature 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.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>

- *

- * @generated

- */

-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

-	 */

-	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 FeatureTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.FEATURE_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.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		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) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_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.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);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		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();

-	}

-} // FeatureTreeItemAxisImpl

+/**
+ * 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.FeatureTreeItemAxis;
+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>Feature 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.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>
+ *
+ * @generated
+ */
+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
+	 */
+	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 FeatureTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.FEATURE_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.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		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) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_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.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);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		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();
+	}
+} // FeatureTreeItemAxisImpl
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 6a23e61b96e..c821d9b3096 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
@@ -1,322 +1,322 @@
-/**

- * 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.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.IdAxis;

-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.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id 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.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>

- *

- * @generated

- */

-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

-	 */

-	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 default value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ELEMENT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected String element = ELEMENT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.ID_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

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(String newElement) {

-		String oldElement = element;

-		element = newElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ELEMENT, oldElement, element));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ILabelProviderConfiguration getLocalLabelConfiguration() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		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(", element: "); //$NON-NLS-1$

-		result.append(element);

-		result.append(')');

-		return result.toString();

-	}

-} // IdAxisImpl

+/**
+ * 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.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.IdAxis;
+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.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Id 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.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>
+ *
+ * @generated
+ */
+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
+	 */
+	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 default value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ELEMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected String element = ELEMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ID_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.ID_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
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(String newElement) {
+		String oldElement = element;
+		element = newElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ELEMENT, oldElement, element));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ILabelProviderConfiguration getLocalLabelConfiguration() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		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(", element: "); //$NON-NLS-1$
+		result.append(element);
+		result.append(')');
+		return result.toString();
+	}
+} // IdAxisImpl
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 f94403409da..5e45ccc94c4 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
@@ -1,370 +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.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id 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.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>

- *

- * @generated

- */

-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

-	 */

-	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 IdTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ID_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.ID_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.ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		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) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ID_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.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);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		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();

-	}

-} // IdTreeItemAxisImpl

+/**
+ * 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.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Id 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.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>
+ *
+ * @generated
+ */
+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
+	 */
+	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 IdTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ID_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.ID_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.ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		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) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ID_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.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);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		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();
+	}
+} // IdTreeItemAxisImpl
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 12e9fbf68dc..0ec9f1b88cb 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
@@ -1,234 +1,234 @@
-/**

- * 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.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisFactoryImpl extends EFactoryImpl implements NattableaxisFactory {

-

-	/**

-	 * 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) {

-				return theNattableaxisFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableaxisFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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_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

-	public IdTreeItemAxis createIdTreeItemAxis() {

-		IdTreeItemAxisImpl idTreeItemAxis = new IdTreeItemAxisImpl();

-		return idTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectAxis createEObjectAxis() {

-		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();

-		return eObjectAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectTreeItemAxis createEObjectTreeItemAxis() {

-		EObjectTreeItemAxisImpl eObjectTreeItemAxis = new EObjectTreeItemAxisImpl();

-		return eObjectTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureIdAxis createFeatureIdAxis() {

-		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();

-		return featureIdAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureIdTreeItemAxis createFeatureIdTreeItemAxis() {

-		FeatureIdTreeItemAxisImpl featureIdTreeItemAxis = new FeatureIdTreeItemAxisImpl();

-		return featureIdTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeatureAxis createEStructuralFeatureAxis() {

-		EStructuralFeatureAxisImpl eStructuralFeatureAxis = new EStructuralFeatureAxisImpl();

-		return eStructuralFeatureAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperationAxis createEOperationAxis() {

-		EOperationAxisImpl eOperationAxis = new EOperationAxisImpl();

-		return eOperationAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis() {

-		EStructuralFeatureTreeItemAxisImpl eStructuralFeatureTreeItemAxis = new EStructuralFeatureTreeItemAxisImpl();

-		return eStructuralFeatureTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperationTreeItemAxis createEOperationTreeItemAxis() {

-		EOperationTreeItemAxisImpl eOperationTreeItemAxis = new EOperationTreeItemAxisImpl();

-		return eOperationTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectIdAxis createObjectIdAxis() {

-		ObjectIdAxisImpl objectIdAxis = new ObjectIdAxisImpl();

-		return objectIdAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectIdTreeItemAxis createObjectIdTreeItemAxis() {

-		ObjectIdTreeItemAxisImpl objectIdTreeItemAxis = new ObjectIdTreeItemAxisImpl();

-		return objectIdTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisGroup createAxisGroup() {

-		AxisGroupImpl axisGroup = new AxisGroupImpl();

-		return axisGroup;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisPackage getNattableaxisPackage() {

-		return (NattableaxisPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableaxisPackage getPackage() {

-		return NattableaxisPackage.eINSTANCE;

-	}

-} // NattableaxisFactoryImpl

+/**
+ * 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.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisFactoryImpl extends EFactoryImpl implements NattableaxisFactory {
+
+	/**
+	 * 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) {
+				return theNattableaxisFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableaxisFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- 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_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
+	public IdTreeItemAxis createIdTreeItemAxis() {
+		IdTreeItemAxisImpl idTreeItemAxis = new IdTreeItemAxisImpl();
+		return idTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectAxis createEObjectAxis() {
+		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();
+		return eObjectAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectTreeItemAxis createEObjectTreeItemAxis() {
+		EObjectTreeItemAxisImpl eObjectTreeItemAxis = new EObjectTreeItemAxisImpl();
+		return eObjectTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureIdAxis createFeatureIdAxis() {
+		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();
+		return featureIdAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureIdTreeItemAxis createFeatureIdTreeItemAxis() {
+		FeatureIdTreeItemAxisImpl featureIdTreeItemAxis = new FeatureIdTreeItemAxisImpl();
+		return featureIdTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeatureAxis createEStructuralFeatureAxis() {
+		EStructuralFeatureAxisImpl eStructuralFeatureAxis = new EStructuralFeatureAxisImpl();
+		return eStructuralFeatureAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperationAxis createEOperationAxis() {
+		EOperationAxisImpl eOperationAxis = new EOperationAxisImpl();
+		return eOperationAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis() {
+		EStructuralFeatureTreeItemAxisImpl eStructuralFeatureTreeItemAxis = new EStructuralFeatureTreeItemAxisImpl();
+		return eStructuralFeatureTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperationTreeItemAxis createEOperationTreeItemAxis() {
+		EOperationTreeItemAxisImpl eOperationTreeItemAxis = new EOperationTreeItemAxisImpl();
+		return eOperationTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectIdAxis createObjectIdAxis() {
+		ObjectIdAxisImpl objectIdAxis = new ObjectIdAxisImpl();
+		return objectIdAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectIdTreeItemAxis createObjectIdTreeItemAxis() {
+		ObjectIdTreeItemAxisImpl objectIdTreeItemAxis = new ObjectIdTreeItemAxisImpl();
+		return objectIdTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisGroup createAxisGroup() {
+		AxisGroupImpl axisGroup = new AxisGroupImpl();
+		return axisGroup;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisPackage getNattableaxisPackage() {
+		return (NattableaxisPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableaxisPackage getPackage() {
+		return NattableaxisPackage.eINSTANCE;
+	}
+} // NattableaxisFactoryImpl
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 6bcdae9d8ba..09f9881e5b2 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
@@ -1,891 +1,891 @@
-/**

- * 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.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.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;

-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.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.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.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;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisPackageImpl extends EPackageImpl implements NattableaxisPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass idAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass idTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass operationAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass operationTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureIdAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureIdTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eStructuralFeatureAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eOperationAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eStructuralFeatureTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eOperationTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectIdAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectIdTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- 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

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableaxisPackageImpl() {

-		super(eNS_URI, NattableaxisFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link 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);

-

-		// 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();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.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);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableaxisPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableaxisPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.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;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIAxis() {

-		return iAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getIAxis_Manager() {

-		return (EReference)iAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIAxis_Alias() {

-		return (EAttribute)iAxisEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getIAxis__GetElement() {

-		return iAxisEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getIAxis__GetLocalLabelConfiguration() {

-		return iAxisEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getITreeItemAxis() {

-		return iTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getITreeItemAxis_Parent() {

-		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getITreeItemAxis_Expanded() {

-		return (EAttribute)iTreeItemAxisEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getITreeItemAxis_Children() {

-		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIdAxis() {

-		return idAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIdAxis_Element() {

-		return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIdTreeItemAxis() {

-		return idTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectAxis() {

-		return eObjectAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectAxis_Element() {

-		return (EReference)eObjectAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectTreeItemAxis() {

-		return eObjectTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureAxis() {

-		return featureAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getFeatureAxis_LocalLabelConfiguration() {

-		return (EReference)featureAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- 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

-	public EClass getFeatureTreeItemAxis() {

-		return featureTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getOperationTreeItemAxis() {

-		return operationTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectAxis() {

-		return objectAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getObjectAxis_LocalLabelConfiguration() {

-		return (EReference)objectAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectTreeItemAxis() {

-		return objectTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureIdAxis() {

-		return featureIdAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureIdTreeItemAxis() {

-		return featureIdTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEStructuralFeatureAxis() {

-		return eStructuralFeatureAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEStructuralFeatureAxis_Element() {

-		return (EReference)eStructuralFeatureAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- 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

-	public EClass getEStructuralFeatureTreeItemAxis() {

-		return eStructuralFeatureTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getEOperationTreeItemAxis() {

-		return eOperationTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectIdAxis() {

-		return objectIdAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectIdTreeItemAxis() {

-		return objectIdTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAxisGroup() {

-		return axisGroupEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getAxisGroup_GroupedAxis() {

-		return (EReference)axisGroupEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisFactory getNattableaxisFactory() {

-		return (NattableaxisFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		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());

-		idAxisEClass.getESuperTypes().add(this.getIAxis());

-		idTreeItemAxisEClass.getESuperTypes().add(this.getIdAxis());

-		idTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		eObjectAxisEClass.getESuperTypes().add(this.getObjectAxis());

-		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());

-		featureIdAxisEClass.getESuperTypes().add(this.getIdAxis());

-		featureIdAxisEClass.getESuperTypes().add(this.getFeatureAxis());

-		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, 0, 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(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(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$

-	}

-} // NattableaxisPackageImpl

+/**
+ * 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.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.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;
+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.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.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.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;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisPackageImpl extends EPackageImpl implements NattableaxisPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass idAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass idTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass operationAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass operationTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureIdAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureIdTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eStructuralFeatureAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eOperationAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eStructuralFeatureTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eOperationTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectIdAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectIdTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- 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
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableaxisPackageImpl() {
+		super(eNS_URI, NattableaxisFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link 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);
+
+		// 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();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.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);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableaxisPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableaxisPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.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;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIAxis() {
+		return iAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIAxis_Manager() {
+		return (EReference)iAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIAxis_Alias() {
+		return (EAttribute)iAxisEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getIAxis__GetElement() {
+		return iAxisEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getIAxis__GetLocalLabelConfiguration() {
+		return iAxisEClass.getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getITreeItemAxis() {
+		return iTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getITreeItemAxis_Parent() {
+		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getITreeItemAxis_Expanded() {
+		return (EAttribute)iTreeItemAxisEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getITreeItemAxis_Children() {
+		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIdAxis() {
+		return idAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIdAxis_Element() {
+		return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIdTreeItemAxis() {
+		return idTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectAxis() {
+		return eObjectAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectAxis_Element() {
+		return (EReference)eObjectAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectTreeItemAxis() {
+		return eObjectTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureAxis() {
+		return featureAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getFeatureAxis_LocalLabelConfiguration() {
+		return (EReference)featureAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- 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
+	public EClass getFeatureTreeItemAxis() {
+		return featureTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getOperationTreeItemAxis() {
+		return operationTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectAxis() {
+		return objectAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getObjectAxis_LocalLabelConfiguration() {
+		return (EReference)objectAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectTreeItemAxis() {
+		return objectTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureIdAxis() {
+		return featureIdAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureIdTreeItemAxis() {
+		return featureIdTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEStructuralFeatureAxis() {
+		return eStructuralFeatureAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEStructuralFeatureAxis_Element() {
+		return (EReference)eStructuralFeatureAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- 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
+	public EClass getEStructuralFeatureTreeItemAxis() {
+		return eStructuralFeatureTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getEOperationTreeItemAxis() {
+		return eOperationTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectIdAxis() {
+		return objectIdAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectIdTreeItemAxis() {
+		return objectIdTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAxisGroup() {
+		return axisGroupEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getAxisGroup_GroupedAxis() {
+		return (EReference)axisGroupEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisFactory getNattableaxisFactory() {
+		return (NattableaxisFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		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());
+		idAxisEClass.getESuperTypes().add(this.getIAxis());
+		idTreeItemAxisEClass.getESuperTypes().add(this.getIdAxis());
+		idTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		eObjectAxisEClass.getESuperTypes().add(this.getObjectAxis());
+		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());
+		featureIdAxisEClass.getESuperTypes().add(this.getIdAxis());
+		featureIdAxisEClass.getESuperTypes().add(this.getFeatureAxis());
+		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, 0, 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(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(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$
+	}
+} // NattableaxisPackageImpl
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 724c4e096d8..bb96a475044 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
@@ -1,347 +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.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object 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.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>

- *

- * @generated

- */

-public abstract class ObjectAxisImpl extends StyledElementImpl implements ObjectAxis {

-

-	/**

-	 * 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 ObjectLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.OBJECT_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

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.OBJECT_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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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.OBJECT_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();

-	}

-} // ObjectAxisImpl

+/**
+ * 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.ObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object 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.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>
+ *
+ * @generated
+ */
+public abstract class ObjectAxisImpl extends StyledElementImpl implements ObjectAxis {
+
+	/**
+	 * 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 ObjectLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.OBJECT_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
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.OBJECT_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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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.OBJECT_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();
+	}
+} // ObjectAxisImpl
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 9952edd79b1..909aa1672b8 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
@@ -1,217 +1,217 @@
-/**

- * 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.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-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.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Id 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.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected ObjectLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectIdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.OBJECT_ID_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.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-} // ObjectIdAxisImpl

+/**
+ * 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.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+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.nattablelabelprovider.ObjectLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Id 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.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected ObjectLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectIdAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_ID_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.OBJECT_ID_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.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+} // ObjectIdAxisImpl
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 d6f3c5d283b..37556e93ebb 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
@@ -1,370 +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.ObjectIdTreeItemAxis;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Id 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.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>

- *

- * @generated

- */

-public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements ObjectIdTreeItemAxis {

-

-	/**

-	 * 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 ObjectIdTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_ID_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.OBJECT_ID_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.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.OBJECT_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		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) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_ID_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.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);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		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();

-	}

-} // ObjectIdTreeItemAxisImpl

+/**
+ * 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.ObjectIdTreeItemAxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Id 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.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>
+ *
+ * @generated
+ */
+public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements ObjectIdTreeItemAxis {
+
+	/**
+	 * 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 ObjectIdTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_ID_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.OBJECT_ID_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.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.OBJECT_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		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) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_ID_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.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);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		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();
+	}
+} // ObjectIdTreeItemAxisImpl
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 a2afc4a1e38..372602785b7 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
@@ -1,370 +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.ObjectTreeItemAxis;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object 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.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>

- *

- * @generated

- */

-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

-	 */

-	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 ObjectTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.OBJECT_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.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	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.OBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		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) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_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.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);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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.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);

-	}

-

-	/**

-	 * <!-- 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;

-			}

-		}

-		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();

-	}

-} // ObjectTreeItemAxisImpl

+/**
+ * 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.ObjectTreeItemAxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object 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.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>
+ *
+ * @generated
+ */
+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
+	 */
+	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 ObjectTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.OBJECT_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.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	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.OBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		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) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_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.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);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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.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);
+	}
+
+	/**
+	 * <!-- 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;
+			}
+		}
+		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();
+	}
+} // ObjectTreeItemAxisImpl
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
index a3488bbc264..69f1fa2bffb 100644
--- 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
@@ -1,347 +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

+/**
+ * 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
index e07f14d6ec2..a812ed137bf 100644
--- 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
@@ -1,370 +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

+/**
+ * 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 82c2da4d3f1..d9ca3826c60 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
@@ -1,541 +1,541 @@
-/**

- * 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.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.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;

-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;

-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.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.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-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.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

- * @generated

- */

-public class NattableaxisAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected 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 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.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

-	 * @generated

-	 */

-	public Adapter createIAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createITreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis <em>Id Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis

-	 * @generated

-	 */

-	public Adapter createIdAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createIdTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEObjectAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEObjectTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createFeatureAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createFeatureTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createObjectAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createObjectTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createFeatureIdAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createFeatureIdTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEStructuralFeatureAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createObjectIdAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createObjectIdTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createAxisGroupAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableaxisAdapterFactory

+/**
+ * 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.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.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;
+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;
+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.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.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+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.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage
+ * @generated
+ */
+public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected 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 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.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis
+	 * @generated
+	 */
+	public Adapter createIAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createITreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis <em>Id Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis
+	 * @generated
+	 */
+	public Adapter createIdAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createIdTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEObjectAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEObjectTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createFeatureAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createFeatureTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createObjectAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createObjectTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createFeatureIdAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createFeatureIdTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEStructuralFeatureAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createObjectIdAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createObjectIdTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createAxisGroupAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableaxisAdapterFactory
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 2edc98ad59b..db8a58e6dad 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
@@ -1,681 +1,681 @@
-/**

- * 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.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.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;

-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;

-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.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.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-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.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

- * @generated

- */

-public class NattableaxisSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case 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);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IAxis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>IAxis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIAxis(IAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ITree 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>ITree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseITreeItemAxis(ITreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Id Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIdAxis(IdAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Id 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>Id Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIdTreeItemAxis(IdTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectAxis(EObjectAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject 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>EObject Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature 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>Feature Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureAxis(FeatureAxis object) {

-		return null;

-	}

-

-	/**

-	 * 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.

-	 * @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

-	 */

-	public T caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * 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.

-	 * @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

-	 */

-	public T caseObjectAxis(ObjectAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object 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>Object Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectTreeItemAxis(ObjectTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureIdAxis(FeatureIdAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Id 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>Feature Id Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature 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>EStructural Feature Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {

-		return null;

-	}

-

-	/**

-	 * 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.

-	 * @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

-	 */

-	public T caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * 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.

-	 * @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

-	 */

-	public T caseObjectIdAxis(ObjectIdAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object Id 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>Object Id Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Group</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Axis Group</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisGroup(AxisGroup object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableaxisSwitch

+/**
+ * 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.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.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;
+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;
+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.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.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+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.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage
+ * @generated
+ */
+public class NattableaxisSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case 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);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IAxis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>IAxis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIAxis(IAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ITree 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>ITree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseITreeItemAxis(ITreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Id Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdAxis(IdAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Id 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>Id Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdTreeItemAxis(IdTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectAxis(EObjectAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject 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>EObject Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature 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>Feature Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureAxis(FeatureAxis object) {
+		return null;
+	}
+
+	/**
+	 * 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.
+	 * @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
+	 */
+	public T caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * 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.
+	 * @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
+	 */
+	public T caseObjectAxis(ObjectAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object 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>Object Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectTreeItemAxis(ObjectTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureIdAxis(FeatureIdAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Id 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>Feature Id Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature 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>EStructural Feature Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {
+		return null;
+	}
+
+	/**
+	 * 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.
+	 * @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
+	 */
+	public T caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * 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.
+	 * @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
+	 */
+	public T caseObjectIdAxis(ObjectIdAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object Id 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>Object Id Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Group</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Axis Group</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisGroup(AxisGroup object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableaxisSwitch
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 8ecd1c4ff67..018cc668977 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
@@ -1,185 +1,185 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.

- * <!-- 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>

- * </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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractHeaderAxisConfiguration extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Index Style</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_IndexStyle()

-	 * @model required="true"

-	 * @generated

-	 */

-	AxisIndexStyle getIndexStyle();

-

-	/**

-	 * 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.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * @see #getIndexStyle()

-	 * @generated

-	 */

-	void setIndexStyle(AxisIndexStyle value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayLabel();

-

-	/**

-	 * 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.

-	 * @see #isDisplayLabel()

-	 * @generated

-	 */

-	void setDisplayLabel(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Filter</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="false" required="true"

-	 * @generated

-	 */

-	boolean isDisplayFilter();

-

-	/**

-	 * 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.

-	 * @see #isDisplayFilter()

-	 * @generated

-	 */

-	void setDisplayFilter(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Index</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIndex();

-

-	/**

-	 * 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.

-	 * @see #isDisplayIndex()

-	 * @generated

-	 */

-	void setDisplayIndex(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Owned Label Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<ILabelProviderConfiguration> getOwnedLabelConfigurations();

-

-	/**

-	 * Returns the value of the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getOwnedAxisConfigurations();

-} // AbstractHeaderAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.
+ * <!-- 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>
+ * </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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractHeaderAxisConfiguration extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Index Style</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_IndexStyle()
+	 * @model required="true"
+	 * @generated
+	 */
+	AxisIndexStyle getIndexStyle();
+
+	/**
+	 * 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.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
+	 * @see #getIndexStyle()
+	 * @generated
+	 */
+	void setIndexStyle(AxisIndexStyle value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayLabel();
+
+	/**
+	 * 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.
+	 * @see #isDisplayLabel()
+	 * @generated
+	 */
+	void setDisplayLabel(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Filter</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isDisplayFilter();
+
+	/**
+	 * 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.
+	 * @see #isDisplayFilter()
+	 * @generated
+	 */
+	void setDisplayFilter(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Index</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayIndex();
+
+	/**
+	 * 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.
+	 * @see #isDisplayIndex()
+	 * @generated
+	 */
+	void setDisplayIndex(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Owned Label Configurations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<ILabelProviderConfiguration> getOwnedLabelConfigurations();
+
+	/**
+	 * Returns the value of the '<em><b>Owned Axis Configurations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<IAxisConfiguration> getOwnedAxisConfigurations();
+} // AbstractHeaderAxisConfiguration
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 294e9668ff4..a86d9d5479b 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
@@ -1,225 +1,225 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Axis Index Style</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * <!-- 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

- */

-public enum AxisIndexStyle implements Enumerator {

-	/**

-	 * The '<em><b>ALPHABETIC</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #ALPHABETIC_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ALPHABETIC(1, "ALPHABETIC", "ALPHABETIC"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>NUMERIC</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #NUMERIC_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	NUMERIC(0, "NUMERIC", "NUMERIC"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>ALPHABETIC</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Index Headers count will be : A-B-C-...Y-Z-AA-AB-...

-	 * <!-- end-model-doc -->

-	 * @see #ALPHABETIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ALPHABETIC_VALUE = 1;

-

-	/**

-	 * The '<em><b>NUMERIC</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Index Headers count will be : 1-2-3-...

-	 * <!-- end-model-doc -->

-	 * @see #NUMERIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int NUMERIC_VALUE = 0;

-

-	/**

-	 * 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,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<AxisIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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) {

-			AxisIndexStyle result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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) {

-			AxisIndexStyle result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private AxisIndexStyle(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // AxisIndexStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Axis Index Style</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- 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
+ */
+public enum AxisIndexStyle implements Enumerator {
+	/**
+	 * The '<em><b>ALPHABETIC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ALPHABETIC_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ALPHABETIC(1, "ALPHABETIC", "ALPHABETIC"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>NUMERIC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NUMERIC_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NUMERIC(0, "NUMERIC", "NUMERIC"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>ALPHABETIC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Index Headers count will be : A-B-C-...Y-Z-AA-AB-...
+	 * <!-- end-model-doc -->
+	 * @see #ALPHABETIC
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ALPHABETIC_VALUE = 1;
+
+	/**
+	 * The '<em><b>NUMERIC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Index Headers count will be : 1-2-3-...
+	 * <!-- end-model-doc -->
+	 * @see #NUMERIC
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NUMERIC_VALUE = 0;
+
+	/**
+	 * 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,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<AxisIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @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) {
+			AxisIndexStyle result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @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) {
+			AxisIndexStyle result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @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;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private AxisIndexStyle(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // AxisIndexStyle
diff --git a/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 4b6a37056f9..9aeb461f1a8 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
@@ -1,107 +1,107 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Manager Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This object allows to define and configure a Java AxisManager

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration()

- * @model

- * @generated

- */

-public interface AxisManagerConfiguration extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Local Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Header Label Configuration</em>' reference.

-	 * @see #getLocalHeaderLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Axis Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	AxisManagerRepresentation getAxisManager();

-

-	/**

-	 * 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.

-	 * @see #getAxisManager()

-	 * @generated

-	 */

-	void setAxisManager(AxisManagerRepresentation value);

-

-	/**

-	 * Returns the value of the '<em><b>Local Specific Configurations</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getLocalSpecificConfigurations();

-} // AxisManagerConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Manager Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This object allows to define and configure a Java AxisManager
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration()
+ * @model
+ * @generated
+ */
+public interface AxisManagerConfiguration extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Local Header Label Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Header Label Configuration</em>' reference.
+	 * @see #getLocalHeaderLabelConfiguration()
+	 * @generated
+	 */
+	void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Axis Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	AxisManagerRepresentation getAxisManager();
+
+	/**
+	 * 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.
+	 * @see #getAxisManager()
+	 * @generated
+	 */
+	void setAxisManager(AxisManagerRepresentation value);
+
+	/**
+	 * Returns the value of the '<em><b>Local Specific Configurations</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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
+	 * @generated
+	 */
+	EList<IAxisConfiguration> getLocalSpecificConfigurations();
+} // AxisManagerConfiguration
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 9330b5f288f..8df0dd35f2d 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
@@ -1,137 +1,137 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Manager Representation</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This class is used to represents in the model the java Axis Manager.

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @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 = \'\')'"

- * @generated

- */

-public interface AxisManagerRepresentation extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Manager Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getAxisManagerId();

-

-	/**

-	 * 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.

-	 * @see #getAxisManagerId()

-	 * @generated

-	 */

-	void setAxisManagerId(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model

-	 * @generated

-	 */

-	String getLabelProviderContext();

-

-	/**

-	 * 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.

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 */

-	void setLabelProviderContext(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getHeaderLabelConfiguration();

-

-	/**

-	 * 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.

-	 * @see #getHeaderLabelConfiguration()

-	 * @generated

-	 */

-	void setHeaderLabelConfiguration(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Specific Axis Configurations</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getSpecificAxisConfigurations();

-} // AxisManagerRepresentation

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Manager Representation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This class is used to represents in the model the java Axis Manager.
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @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 = \'\')'"
+ * @generated
+ */
+public interface AxisManagerRepresentation extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Manager Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getAxisManagerId();
+
+	/**
+	 * 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.
+	 * @see #getAxisManagerId()
+	 * @generated
+	 */
+	void setAxisManagerId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model
+	 * @generated
+	 */
+	String getLabelProviderContext();
+
+	/**
+	 * 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.
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 */
+	void setLabelProviderContext(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Header Label Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	ILabelProviderConfiguration getHeaderLabelConfiguration();
+
+	/**
+	 * 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.
+	 * @see #getHeaderLabelConfiguration()
+	 * @generated
+	 */
+	void setHeaderLabelConfiguration(ILabelProviderConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Specific Axis Configurations</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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
+	 * @generated
+	 */
+	EList<IAxisConfiguration> getSpecificAxisConfigurations();
+} // AxisManagerRepresentation
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 7533c0fc2a8..b72d13f61e1 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
@@ -1,64 +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.nattableaxisconfiguration;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration used to fill the table listening a feature of the context of the table

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration()

- * @model

- * @generated

- */

-public interface EStructuralFeatureValueFillingConfiguration extends IFillingConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Listen Feature</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	EStructuralFeature getListenFeature();

-

-	/**

-	 * 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.

-	 * @see #getListenFeature()

-	 * @generated

-	 */

-	void setListenFeature(EStructuralFeature value);

-} // EStructuralFeatureValueFillingConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Configuration used to fill the table listening a feature of the context of the table
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration()
+ * @model
+ * @generated
+ */
+public interface EStructuralFeatureValueFillingConfiguration extends IFillingConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Listen Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	EStructuralFeature getListenFeature();
+
+	/**
+	 * 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.
+	 * @see #getListenFeature()
+	 * @generated
+	 */
+	void setListenFeature(EStructuralFeature value);
+} // EStructuralFeatureValueFillingConfiguration
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 e9031b5ba48..1106069c51c 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
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration to use for Axis representing features

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration()

- * @model

- * @generated

- */

-public interface FeatureAxisConfiguration extends IAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Show Only Common Feature</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Show Only Common Feature</em>' attribute.

-	 * @see #isShowOnlyCommonFeature()

-	 * @generated

-	 */

-	void setShowOnlyCommonFeature(boolean value);

-} // FeatureAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Configuration to use for Axis representing features
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration()
+ * @model
+ * @generated
+ */
+public interface FeatureAxisConfiguration extends IAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Show Only Common Feature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Show Only Common Feature</em>' attribute.
+	 * @see #isShowOnlyCommonFeature()
+	 * @generated
+	 */
+	void setShowOnlyCommonFeature(boolean value);
+} // FeatureAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
index 645d91be1ed..c9980a39777 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
@@ -1,32 +1,32 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IAxis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Comon Interface for axis configuration.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIAxisConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IAxisConfiguration extends StyledElement {

-} // IAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IAxis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Comon Interface for axis configuration.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIAxisConfiguration()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IAxisConfiguration extends StyledElement {
+} // IAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
index e4deff020c0..8eeeef0fd6c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IFilling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Comon Interface for filling configurations.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIFillingConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IFillingConfiguration extends IAxisConfiguration {

-} // IFillingConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IFilling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Comon Interface for filling configurations.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIFillingConfiguration()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IFillingConfiguration extends IAxisConfiguration {
+} // IFillingConfiguration
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 f0e6b61571c..7a11d328cc6 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
@@ -1,81 +1,81 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IPaste Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Common Interface for the paste configuration.

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration()

- * @model

- * @generated

- */

-public interface IPasteConfiguration extends IAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Post Actions</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- 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. 

-	 * <!-- 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

-	 * @generated

-	 */

-	EList<String> getPostActions();

-

-	/**

-	 * Returns the value of the '<em><b>Detached Mode</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model default="true"

-	 * @generated

-	 */

-	boolean isDetachedMode();

-

-	/**

-	 * 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.

-	 * @see #isDetachedMode()

-	 * @generated

-	 */

-	void setDetachedMode(boolean value);

-} // IPasteConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IPaste Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Common Interface for the paste configuration.
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration()
+ * @model
+ * @generated
+ */
+public interface IPasteConfiguration extends IAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Post Actions</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- 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. 
+	 * <!-- 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
+	 * @generated
+	 */
+	EList<String> getPostActions();
+
+	/**
+	 * Returns the value of the '<em><b>Detached Mode</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model default="true"
+	 * @generated
+	 */
+	boolean isDetachedMode();
+
+	/**
+	 * 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.
+	 * @see #isDetachedMode()
+	 * @generated
+	 */
+	void setDetachedMode(boolean value);
+} // IPasteConfiguration
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 0369915fe3f..cdc549379cb 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
@@ -1,53 +1,53 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Define the configuration of the axis (rows or columns) in the table.

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration()

- * @model

- * @generated

- */

-public interface LocalTableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Manager Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<AxisManagerConfiguration> getAxisManagerConfigurations();

-} // LocalTableHeaderAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Define the configuration of the axis (rows or columns) in the table.
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration()
+ * @model
+ * @generated
+ */
+public interface LocalTableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Manager Configurations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<AxisManagerConfiguration> getAxisManagerConfigurations();
+} // LocalTableHeaderAxisConfiguration
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 541f6d32262..ae1ee87b388 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
@@ -1,124 +1,124 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public interface NattableaxisconfigurationFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Axis Manager Representation</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Axis Manager Representation</em>'.

-	 * @generated

-	 */

-	AxisManagerRepresentation createAxisManagerRepresentation();

-

-	/**

-	 * 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

-	 */

-	AxisManagerConfiguration createAxisManagerConfiguration();

-

-	/**

-	 * 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

-	 */

-	TableHeaderAxisConfiguration createTableHeaderAxisConfiguration();

-

-	/**

-	 * 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

-	 */

-	LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration();

-

-	/**

-	 * 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

-	 */

-	FeatureAxisConfiguration createFeatureAxisConfiguration();

-

-	/**

-	 * 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

-	 */

-	EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration();

-

-	/**

-	 * 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

-	 */

-	IPasteConfiguration createIPasteConfiguration();

-

-	/**

-	 * 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

-	 */

-	PasteEObjectConfiguration createPasteEObjectConfiguration();

-

-	/**

-	 * 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

-	 */

-	TreeFillingConfiguration createTreeFillingConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableaxisconfigurationPackage getNattableaxisconfigurationPackage();

-} // NattableaxisconfigurationFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+public interface NattableaxisconfigurationFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Axis Manager Representation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Axis Manager Representation</em>'.
+	 * @generated
+	 */
+	AxisManagerRepresentation createAxisManagerRepresentation();
+
+	/**
+	 * 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
+	 */
+	AxisManagerConfiguration createAxisManagerConfiguration();
+
+	/**
+	 * 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
+	 */
+	TableHeaderAxisConfiguration createTableHeaderAxisConfiguration();
+
+	/**
+	 * 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
+	 */
+	LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration();
+
+	/**
+	 * 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
+	 */
+	FeatureAxisConfiguration createFeatureAxisConfiguration();
+
+	/**
+	 * 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
+	 */
+	EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration();
+
+	/**
+	 * 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
+	 */
+	IPasteConfiguration createIPasteConfiguration();
+
+	/**
+	 * 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
+	 */
+	PasteEObjectConfiguration createPasteEObjectConfiguration();
+
+	/**
+	 * 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
+	 */
+	TreeFillingConfiguration createTreeFillingConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableaxisconfigurationPackage getNattableaxisconfigurationPackage();
+} // NattableaxisconfigurationFactory
diff --git a/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 6d1fa7ba7c9..3d17f781aa0 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
@@ -1,54 +1,54 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Defines the configuration of the axis in the TableConfiguration

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @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-&gt;forAll(am1 : AxisManagerRepresentation | ( (axisManagers-&gt;excluding (am1))-&gt;forAll(am2 : AxisManagerRepresentation | am1.axisManagerId&lt;&gt;am2.axisManagerId) ))'"

- * @generated

- */

-public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Managers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<AxisManagerRepresentation> getAxisManagers();

-} // TableHeaderAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Defines the configuration of the axis in the TableConfiguration
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @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-&gt;forAll(am1 : AxisManagerRepresentation | ( (axisManagers-&gt;excluding (am1))-&gt;forAll(am2 : AxisManagerRepresentation | am1.axisManagerId&lt;&gt;am2.axisManagerId) ))'"
+ * @generated
+ */
+public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Managers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<AxisManagerRepresentation> getAxisManagers();
+} // TableHeaderAxisConfiguration
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 20a2c9ac78f..f3ce333b236 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
@@ -1,193 +1,193 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Tree Filling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <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#getFilterRule <em>Filter Rule</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration()

- * @model

- * @generated

- */

-public interface TreeFillingConfiguration extends IFillingConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Used As Axis Provider</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Axis Used As Axis Provider</em>' containment reference isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Axis Used As Axis Provider</em>' containment reference.

-	 * @see #setAxisUsedAsAxisProvider(IAxis)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_AxisUsedAsAxisProvider()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.

-	 * @see #getAxisUsedAsAxisProvider()

-	 * @generated

-	 */

-	void setAxisUsedAsAxisProvider(IAxis value);

-

-	/**

-	 * Returns the value of the '<em><b>Paste Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model

-	 * @generated

-	 */

-	PasteEObjectConfiguration getPasteConfiguration();

-

-	/**

-	 * 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.

-	 * @see #getPasteConfiguration()

-	 * @generated

-	 */

-	void setPasteConfiguration(PasteEObjectConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Depth</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model

-	 * @generated

-	 */

-	int getDepth();

-

-	/**

-	 * 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.

-	 * @see #getDepth()

-	 * @generated

-	 */

-	void setDepth(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Label Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getLabelProvider();

-

-	/**

-	 * 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.

-	 * @see #getLabelProvider()

-	 * @generated

-	 */

-	void setLabelProvider(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Label Provider Context</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Label Provider Context</em>' attribute.

-	 * @see #setLabelProviderContext(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProviderContext()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getLabelProviderContext();

-

-	/**

-	 * 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.

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 */

-	void setLabelProviderContext(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Filter Rule</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field is used to filter the elements to show for this depth. 

-	 * Only element matching the filter will be returned.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Filter Rule</em>' containment reference.

-	 * @see #setFilterRule(IBooleanEObjectExpression)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_FilterRule()

-	 * @model containment="true"

-	 * @generated

-	 */

-	IBooleanEObjectExpression getFilterRule();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getFilterRule <em>Filter Rule</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Filter Rule</em>' containment reference.

-	 * @see #getFilterRule()

-	 * @generated

-	 */

-	void setFilterRule(IBooleanEObjectExpression value);

-} // TreeFillingConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Tree Filling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <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#getFilterRule <em>Filter Rule</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration()
+ * @model
+ * @generated
+ */
+public interface TreeFillingConfiguration extends IFillingConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Used As Axis Provider</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Axis Used As Axis Provider</em>' containment reference isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Axis Used As Axis Provider</em>' containment reference.
+	 * @see #setAxisUsedAsAxisProvider(IAxis)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_AxisUsedAsAxisProvider()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.
+	 * @see #getAxisUsedAsAxisProvider()
+	 * @generated
+	 */
+	void setAxisUsedAsAxisProvider(IAxis value);
+
+	/**
+	 * Returns the value of the '<em><b>Paste Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model
+	 * @generated
+	 */
+	PasteEObjectConfiguration getPasteConfiguration();
+
+	/**
+	 * 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.
+	 * @see #getPasteConfiguration()
+	 * @generated
+	 */
+	void setPasteConfiguration(PasteEObjectConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Depth</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model
+	 * @generated
+	 */
+	int getDepth();
+
+	/**
+	 * 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.
+	 * @see #getDepth()
+	 * @generated
+	 */
+	void setDepth(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Label Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	ILabelProviderConfiguration getLabelProvider();
+
+	/**
+	 * 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.
+	 * @see #getLabelProvider()
+	 * @generated
+	 */
+	void setLabelProvider(ILabelProviderConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Label Provider Context</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Label Provider Context</em>' attribute.
+	 * @see #setLabelProviderContext(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProviderContext()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getLabelProviderContext();
+
+	/**
+	 * 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.
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 */
+	void setLabelProviderContext(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Filter Rule</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field is used to filter the elements to show for this depth. 
+	 * Only element matching the filter will be returned.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Filter Rule</em>' containment reference.
+	 * @see #setFilterRule(IBooleanEObjectExpression)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_FilterRule()
+	 * @model containment="true"
+	 * @generated
+	 */
+	IBooleanEObjectExpression getFilterRule();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getFilterRule <em>Filter Rule</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Filter Rule</em>' containment reference.
+	 * @see #getFilterRule()
+	 * @generated
+	 */
+	void setFilterRule(IBooleanEObjectExpression value);
+} // TreeFillingConfiguration
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 80ccfe1026e..c730c9c77c9 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
@@ -1,437 +1,437 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import 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.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementImpl implements AbstractHeaderAxisConfiguration {

-

-	/**

-	 * The default value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIndexStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final AxisIndexStyle INDEX_STYLE_EDEFAULT = AxisIndexStyle.ALPHABETIC;

-

-	/**

-	 * The cached value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIndexStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisIndexStyle indexStyle = INDEX_STYLE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayFilter()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_FILTER_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayFilter()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayFilter = DISPLAY_FILTER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIndex()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_INDEX_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIndex()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayIndex = DISPLAY_INDEX_EDEFAULT;

-

-	/**

-	 * 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

-	 */

-	protected EList<ILabelProviderConfiguration> ownedLabelConfigurations;

-

-	/**

-	 * 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

-	 */

-	protected EList<IAxisConfiguration> ownedAxisConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AbstractHeaderAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisIndexStyle getIndexStyle() {

-		return indexStyle;

-	}

-

-	/**

-	 * <!-- 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())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE, oldIndexStyle, indexStyle));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayLabel() {

-		return displayLabel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayLabel(boolean newDisplayLabel) {

-		boolean oldDisplayLabel = displayLabel;

-		displayLabel = newDisplayLabel;

-		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

-	public boolean isDisplayFilter() {

-		return displayFilter;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayFilter(boolean newDisplayFilter) {

-		boolean oldDisplayFilter = displayFilter;

-		displayFilter = newDisplayFilter;

-		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

-	public boolean isDisplayIndex() {

-		return displayIndex;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayIndex(boolean newDisplayIndex) {

-		boolean oldDisplayIndex = displayIndex;

-		displayIndex = newDisplayIndex;

-		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) {

-			ownedLabelConfigurations = new EObjectContainmentEList<ILabelProviderConfiguration>(ILabelProviderConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);

-		}

-		return ownedLabelConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxisConfiguration> getOwnedAxisConfigurations() {

-		if (ownedAxisConfigurations == null) {

-			ownedAxisConfigurations = new EObjectContainmentEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);

-		}

-		return ownedAxisConfigurations;

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (indexStyle: "); //$NON-NLS-1$

-		result.append(indexStyle);

-		result.append(", displayLabel: "); //$NON-NLS-1$

-		result.append(displayLabel);

-		result.append(", displayFilter: "); //$NON-NLS-1$

-		result.append(displayFilter);

-		result.append(", displayIndex: "); //$NON-NLS-1$

-		result.append(displayIndex);

-		result.append(')');

-		return result.toString();

-	}

-} // AbstractHeaderAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import 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.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementImpl implements AbstractHeaderAxisConfiguration {
+
+	/**
+	 * The default value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIndexStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final AxisIndexStyle INDEX_STYLE_EDEFAULT = AxisIndexStyle.ALPHABETIC;
+
+	/**
+	 * The cached value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIndexStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisIndexStyle indexStyle = INDEX_STYLE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayFilter()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_FILTER_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayFilter()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayFilter = DISPLAY_FILTER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIndex()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_INDEX_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIndex()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayIndex = DISPLAY_INDEX_EDEFAULT;
+
+	/**
+	 * 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
+	 */
+	protected EList<ILabelProviderConfiguration> ownedLabelConfigurations;
+
+	/**
+	 * 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
+	 */
+	protected EList<IAxisConfiguration> ownedAxisConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractHeaderAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisIndexStyle getIndexStyle() {
+		return indexStyle;
+	}
+
+	/**
+	 * <!-- 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())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE, oldIndexStyle, indexStyle));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayLabel() {
+		return displayLabel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayLabel(boolean newDisplayLabel) {
+		boolean oldDisplayLabel = displayLabel;
+		displayLabel = newDisplayLabel;
+		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
+	public boolean isDisplayFilter() {
+		return displayFilter;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayFilter(boolean newDisplayFilter) {
+		boolean oldDisplayFilter = displayFilter;
+		displayFilter = newDisplayFilter;
+		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
+	public boolean isDisplayIndex() {
+		return displayIndex;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayIndex(boolean newDisplayIndex) {
+		boolean oldDisplayIndex = displayIndex;
+		displayIndex = newDisplayIndex;
+		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) {
+			ownedLabelConfigurations = new EObjectContainmentEList<ILabelProviderConfiguration>(ILabelProviderConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);
+		}
+		return ownedLabelConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxisConfiguration> getOwnedAxisConfigurations() {
+		if (ownedAxisConfigurations == null) {
+			ownedAxisConfigurations = new EObjectContainmentEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);
+		}
+		return ownedAxisConfigurations;
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (indexStyle: "); //$NON-NLS-1$
+		result.append(indexStyle);
+		result.append(", displayLabel: "); //$NON-NLS-1$
+		result.append(displayLabel);
+		result.append(", displayFilter: "); //$NON-NLS-1$
+		result.append(displayFilter);
+		result.append(", displayIndex: "); //$NON-NLS-1$
+		result.append(displayIndex);
+		result.append(')');
+		return result.toString();
+	}
+} // AbstractHeaderAxisConfigurationImpl
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 90e28505c2d..3dd6b10d14a 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
@@ -1,270 +1,270 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-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.EObjectResolvingEList;

-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.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Manager Configuration</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class AxisManagerConfigurationImpl extends StyledElementImpl implements AxisManagerConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getLocalHeaderLabelConfiguration() <em>Local Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalHeaderLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ILabelProviderConfiguration localHeaderLabelConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getAxisManager() <em>Axis Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManager()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisManagerRepresentation axisManager;

-

-	/**

-	 * The cached value of the '{@link #getLocalSpecificConfigurations() <em>Local Specific Configurations</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalSpecificConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxisConfiguration> localSpecificConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisManagerConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ILabelProviderConfiguration getLocalHeaderLabelConfiguration() {

-		if (localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {

-			InternalEObject oldLocalHeaderLabelConfiguration = (InternalEObject)localHeaderLabelConfiguration;

-			localHeaderLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldLocalHeaderLabelConfiguration);

-			if (localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));

-			}

-		}

-		return localHeaderLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ILabelProviderConfiguration basicGetLocalHeaderLabelConfiguration() {

-		return localHeaderLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration newLocalHeaderLabelConfiguration) {

-		ILabelProviderConfiguration oldLocalHeaderLabelConfiguration = localHeaderLabelConfiguration;

-		localHeaderLabelConfiguration = newLocalHeaderLabelConfiguration;

-		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()) {

-			InternalEObject oldAxisManager = (InternalEObject)axisManager;

-			axisManager = (AxisManagerRepresentation)eResolveProxy(oldAxisManager);

-			if (axisManager != oldAxisManager) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));

-			}

-		}

-		return axisManager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetAxisManager() {

-		return axisManager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAxisManager(AxisManagerRepresentation newAxisManager) {

-		AxisManagerRepresentation oldAxisManager = axisManager;

-		axisManager = newAxisManager;

-		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) {

-			localSpecificConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);

-		}

-		return localSpecificConfigurations;

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eIsSet(featureID);

-	}

-} // AxisManagerConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+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.EObjectResolvingEList;
+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.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Manager Configuration</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class AxisManagerConfigurationImpl extends StyledElementImpl implements AxisManagerConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getLocalHeaderLabelConfiguration() <em>Local Header Label Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalHeaderLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected ILabelProviderConfiguration localHeaderLabelConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getAxisManager() <em>Axis Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManager()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisManagerRepresentation axisManager;
+
+	/**
+	 * The cached value of the '{@link #getLocalSpecificConfigurations() <em>Local Specific Configurations</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalSpecificConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxisConfiguration> localSpecificConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisManagerConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ILabelProviderConfiguration getLocalHeaderLabelConfiguration() {
+		if (localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {
+			InternalEObject oldLocalHeaderLabelConfiguration = (InternalEObject)localHeaderLabelConfiguration;
+			localHeaderLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldLocalHeaderLabelConfiguration);
+			if (localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));
+			}
+		}
+		return localHeaderLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ILabelProviderConfiguration basicGetLocalHeaderLabelConfiguration() {
+		return localHeaderLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration newLocalHeaderLabelConfiguration) {
+		ILabelProviderConfiguration oldLocalHeaderLabelConfiguration = localHeaderLabelConfiguration;
+		localHeaderLabelConfiguration = newLocalHeaderLabelConfiguration;
+		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()) {
+			InternalEObject oldAxisManager = (InternalEObject)axisManager;
+			axisManager = (AxisManagerRepresentation)eResolveProxy(oldAxisManager);
+			if (axisManager != oldAxisManager) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));
+			}
+		}
+		return axisManager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetAxisManager() {
+		return axisManager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAxisManager(AxisManagerRepresentation newAxisManager) {
+		AxisManagerRepresentation oldAxisManager = axisManager;
+		axisManager = newAxisManager;
+		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) {
+			localSpecificConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);
+		}
+		return localSpecificConfigurations;
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eIsSet(featureID);
+	}
+} // AxisManagerConfigurationImpl
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 fee21aa50a6..0623b5105c8 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
@@ -1,333 +1,333 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-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.EObjectResolvingEList;

-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.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Manager Representation</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class AxisManagerRepresentationImpl extends StyledElementImpl implements AxisManagerRepresentation {

-

-	/**

-	 * The default value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManagerId()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String AXIS_MANAGER_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManagerId()

-	 * @generated

-	 * @ordered

-	 */

-	protected String axisManagerId = AXIS_MANAGER_ID_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getHeaderLabelConfiguration() <em>Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getHeaderLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ILabelProviderConfiguration headerLabelConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getSpecificAxisConfigurations() <em>Specific Axis Configurations</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getSpecificAxisConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxisConfiguration> specificAxisConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisManagerRepresentationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAxisManagerId() {

-		return axisManagerId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAxisManagerId(String newAxisManagerId) {

-		String oldAxisManagerId = axisManagerId;

-		axisManagerId = newAxisManagerId;

-		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

-	public String getLabelProviderContext() {

-		return labelProviderContext;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLabelProviderContext(String newLabelProviderContext) {

-		String oldLabelProviderContext = labelProviderContext;

-		labelProviderContext = newLabelProviderContext;

-		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()) {

-			InternalEObject oldHeaderLabelConfiguration = (InternalEObject)headerLabelConfiguration;

-			headerLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldHeaderLabelConfiguration);

-			if (headerLabelConfiguration != oldHeaderLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));

-			}

-		}

-		return headerLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ILabelProviderConfiguration basicGetHeaderLabelConfiguration() {

-		return headerLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setHeaderLabelConfiguration(ILabelProviderConfiguration newHeaderLabelConfiguration) {

-		ILabelProviderConfiguration oldHeaderLabelConfiguration = headerLabelConfiguration;

-		headerLabelConfiguration = newHeaderLabelConfiguration;

-		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) {

-			specificAxisConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);

-		}

-		return specificAxisConfigurations;

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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(" (axisManagerId: "); //$NON-NLS-1$

-		result.append(axisManagerId);

-		result.append(", labelProviderContext: "); //$NON-NLS-1$

-		result.append(labelProviderContext);

-		result.append(')');

-		return result.toString();

-	}

-} // AxisManagerRepresentationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+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.EObjectResolvingEList;
+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.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Manager Representation</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class AxisManagerRepresentationImpl extends StyledElementImpl implements AxisManagerRepresentation {
+
+	/**
+	 * The default value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManagerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String AXIS_MANAGER_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManagerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String axisManagerId = AXIS_MANAGER_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getHeaderLabelConfiguration() <em>Header Label Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHeaderLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected ILabelProviderConfiguration headerLabelConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getSpecificAxisConfigurations() <em>Specific Axis Configurations</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSpecificAxisConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxisConfiguration> specificAxisConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisManagerRepresentationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAxisManagerId() {
+		return axisManagerId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAxisManagerId(String newAxisManagerId) {
+		String oldAxisManagerId = axisManagerId;
+		axisManagerId = newAxisManagerId;
+		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
+	public String getLabelProviderContext() {
+		return labelProviderContext;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLabelProviderContext(String newLabelProviderContext) {
+		String oldLabelProviderContext = labelProviderContext;
+		labelProviderContext = newLabelProviderContext;
+		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()) {
+			InternalEObject oldHeaderLabelConfiguration = (InternalEObject)headerLabelConfiguration;
+			headerLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldHeaderLabelConfiguration);
+			if (headerLabelConfiguration != oldHeaderLabelConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));
+			}
+		}
+		return headerLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ILabelProviderConfiguration basicGetHeaderLabelConfiguration() {
+		return headerLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setHeaderLabelConfiguration(ILabelProviderConfiguration newHeaderLabelConfiguration) {
+		ILabelProviderConfiguration oldHeaderLabelConfiguration = headerLabelConfiguration;
+		headerLabelConfiguration = newHeaderLabelConfiguration;
+		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) {
+			specificAxisConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);
+		}
+		return specificAxisConfigurations;
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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(" (axisManagerId: "); //$NON-NLS-1$
+		result.append(axisManagerId);
+		result.append(", labelProviderContext: "); //$NON-NLS-1$
+		result.append(labelProviderContext);
+		result.append(')');
+		return result.toString();
+	}
+} // AxisManagerRepresentationImpl
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 90419f4a4a2..151a7915530 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
@@ -1,166 +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.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class EStructuralFeatureValueFillingConfigurationImpl extends StyledElementImpl implements EStructuralFeatureValueFillingConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getListenFeature()

-	 * @generated

-	 * @ordered

-	 */

-	protected EStructuralFeature listenFeature;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureValueFillingConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeature getListenFeature() {

-		if (listenFeature != null && listenFeature.eIsProxy()) {

-			InternalEObject oldListenFeature = (InternalEObject)listenFeature;

-			listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);

-			if (listenFeature != oldListenFeature) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));

-			}

-		}

-		return listenFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeature basicGetListenFeature() {

-		return listenFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setListenFeature(EStructuralFeature newListenFeature) {

-		EStructuralFeature oldListenFeature = listenFeature;

-		listenFeature = newListenFeature;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-				setListenFeature((EStructuralFeature)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-				setListenFeature((EStructuralFeature)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-				return listenFeature != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EStructuralFeatureValueFillingConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class EStructuralFeatureValueFillingConfigurationImpl extends StyledElementImpl implements EStructuralFeatureValueFillingConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getListenFeature()
+	 * @generated
+	 * @ordered
+	 */
+	protected EStructuralFeature listenFeature;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureValueFillingConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeature getListenFeature() {
+		if (listenFeature != null && listenFeature.eIsProxy()) {
+			InternalEObject oldListenFeature = (InternalEObject)listenFeature;
+			listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);
+			if (listenFeature != oldListenFeature) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));
+			}
+		}
+		return listenFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeature basicGetListenFeature() {
+		return listenFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setListenFeature(EStructuralFeature newListenFeature) {
+		EStructuralFeature oldListenFeature = listenFeature;
+		listenFeature = newListenFeature;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
+				setListenFeature((EStructuralFeature)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
+				setListenFeature((EStructuralFeature)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
+				return listenFeature != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EStructuralFeatureValueFillingConfigurationImpl
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 a37e11ecd41..65bec452bb8 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
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Axis Configuration</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class FeatureAxisConfigurationImpl extends StyledElementImpl implements FeatureAxisConfiguration {

-

-	/**

-	 * The default value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isShowOnlyCommonFeature()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean SHOW_ONLY_COMMON_FEATURE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isShowOnlyCommonFeature()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean showOnlyCommonFeature = SHOW_ONLY_COMMON_FEATURE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isShowOnlyCommonFeature() {

-		return showOnlyCommonFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setShowOnlyCommonFeature(boolean newShowOnlyCommonFeature) {

-		boolean oldShowOnlyCommonFeature = showOnlyCommonFeature;

-		showOnlyCommonFeature = newShowOnlyCommonFeature;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-				setShowOnlyCommonFeature((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (showOnlyCommonFeature: "); //$NON-NLS-1$

-		result.append(showOnlyCommonFeature);

-		result.append(')');

-		return result.toString();

-	}

-} // FeatureAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Axis Configuration</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class FeatureAxisConfigurationImpl extends StyledElementImpl implements FeatureAxisConfiguration {
+
+	/**
+	 * The default value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isShowOnlyCommonFeature()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SHOW_ONLY_COMMON_FEATURE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isShowOnlyCommonFeature()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean showOnlyCommonFeature = SHOW_ONLY_COMMON_FEATURE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isShowOnlyCommonFeature() {
+		return showOnlyCommonFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setShowOnlyCommonFeature(boolean newShowOnlyCommonFeature) {
+		boolean oldShowOnlyCommonFeature = showOnlyCommonFeature;
+		showOnlyCommonFeature = newShowOnlyCommonFeature;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
+				setShowOnlyCommonFeature((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (showOnlyCommonFeature: "); //$NON-NLS-1$
+		result.append(showOnlyCommonFeature);
+		result.append(')');
+		return result.toString();
+	}
+} // FeatureAxisConfigurationImpl
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 d5056c76d27..2a00dd1d884 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
@@ -1,214 +1,214 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>IPaste Configuration</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class IPasteConfigurationImpl extends StyledElementImpl implements IPasteConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getPostActions() <em>Post Actions</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPostActions()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> postActions;

-

-	/**

-	 * The default value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDetachedMode()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DETACHED_MODE_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDetachedMode()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean detachedMode = DETACHED_MODE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPasteConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<String> getPostActions() {

-		if (postActions == null) {

-			postActions = new EDataTypeUniqueEList<String>(String.class, this, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS);

-		}

-		return postActions;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDetachedMode() {

-		return detachedMode;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDetachedMode(boolean newDetachedMode) {

-		boolean oldDetachedMode = detachedMode;

-		detachedMode = newDetachedMode;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (postActions: "); //$NON-NLS-1$

-		result.append(postActions);

-		result.append(", detachedMode: "); //$NON-NLS-1$

-		result.append(detachedMode);

-		result.append(')');

-		return result.toString();

-	}

-} // IPasteConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>IPaste Configuration</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class IPasteConfigurationImpl extends StyledElementImpl implements IPasteConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getPostActions() <em>Post Actions</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPostActions()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> postActions;
+
+	/**
+	 * The default value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDetachedMode()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DETACHED_MODE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDetachedMode()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean detachedMode = DETACHED_MODE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPasteConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<String> getPostActions() {
+		if (postActions == null) {
+			postActions = new EDataTypeUniqueEList<String>(String.class, this, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS);
+		}
+		return postActions;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDetachedMode() {
+		return detachedMode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDetachedMode(boolean newDetachedMode) {
+		boolean oldDetachedMode = detachedMode;
+		detachedMode = newDetachedMode;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (postActions: "); //$NON-NLS-1$
+		result.append(postActions);
+		result.append(", detachedMode: "); //$NON-NLS-1$
+		result.append(detachedMode);
+		result.append(')');
+		return result.toString();
+	}
+} // IPasteConfigurationImpl
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 f38d97e404a..23bc0d146a5 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
@@ -1,157 +1,157 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements LocalTableHeaderAxisConfiguration {

-

-	/**

-	 * 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

-	 */

-	protected EList<AxisManagerConfiguration> axisManagerConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected LocalTableHeaderAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AxisManagerConfiguration> getAxisManagerConfigurations() {

-		if (axisManagerConfigurations == null) {

-			axisManagerConfigurations = new EObjectContainmentEList<AxisManagerConfiguration>(AxisManagerConfiguration.class, this, NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);

-		}

-		return axisManagerConfigurations;

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				return getAxisManagerConfigurations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				getAxisManagerConfigurations().clear();

-				getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eIsSet(featureID);

-	}

-} // LocalTableHeaderAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements LocalTableHeaderAxisConfiguration {
+
+	/**
+	 * 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
+	 */
+	protected EList<AxisManagerConfiguration> axisManagerConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LocalTableHeaderAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AxisManagerConfiguration> getAxisManagerConfigurations() {
+		if (axisManagerConfigurations == null) {
+			axisManagerConfigurations = new EObjectContainmentEList<AxisManagerConfiguration>(AxisManagerConfiguration.class, this, NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);
+		}
+		return axisManagerConfigurations;
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				return getAxisManagerConfigurations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				getAxisManagerConfigurations().clear();
+				getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eIsSet(featureID);
+	}
+} // LocalTableHeaderAxisConfigurationImpl
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 fe8c33e3e7f..c12dd354d75 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
@@ -1,262 +1,262 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-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.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-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.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implements NattableaxisconfigurationFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableaxisconfigurationFactory init() {

-		try {

-			NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);

-			if (theNattableaxisconfigurationFactory != null) {

-				return theNattableaxisconfigurationFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableaxisconfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableaxisconfigurationPackage.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$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-				return convertAxisIndexStyleToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerRepresentation createAxisManagerRepresentation() {

-		AxisManagerRepresentationImpl axisManagerRepresentation = new AxisManagerRepresentationImpl();

-		return axisManagerRepresentation;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerConfiguration createAxisManagerConfiguration() {

-		AxisManagerConfigurationImpl axisManagerConfiguration = new AxisManagerConfigurationImpl();

-		return axisManagerConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableHeaderAxisConfiguration createTableHeaderAxisConfiguration() {

-		TableHeaderAxisConfigurationImpl tableHeaderAxisConfiguration = new TableHeaderAxisConfigurationImpl();

-		return tableHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration() {

-		LocalTableHeaderAxisConfigurationImpl localTableHeaderAxisConfiguration = new LocalTableHeaderAxisConfigurationImpl();

-		return localTableHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureAxisConfiguration createFeatureAxisConfiguration() {

-		FeatureAxisConfigurationImpl featureAxisConfiguration = new FeatureAxisConfigurationImpl();

-		return featureAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration() {

-		EStructuralFeatureValueFillingConfigurationImpl eStructuralFeatureValueFillingConfiguration = new EStructuralFeatureValueFillingConfigurationImpl();

-		return eStructuralFeatureValueFillingConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IPasteConfiguration createIPasteConfiguration() {

-		IPasteConfigurationImpl iPasteConfiguration = new IPasteConfigurationImpl();

-		return iPasteConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public PasteEObjectConfiguration createPasteEObjectConfiguration() {

-		PasteEObjectConfigurationImpl pasteEObjectConfiguration = new PasteEObjectConfigurationImpl();

-		return pasteEObjectConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TreeFillingConfiguration createTreeFillingConfiguration() {

-		TreeFillingConfigurationImpl treeFillingConfiguration = new TreeFillingConfigurationImpl();

-		return treeFillingConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisIndexStyle createAxisIndexStyleFromString(EDataType eDataType, String initialValue) {

-		AxisIndexStyle result = AxisIndexStyle.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertAxisIndexStyleToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisconfigurationPackage getNattableaxisconfigurationPackage() {

-		return (NattableaxisconfigurationPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableaxisconfigurationPackage getPackage() {

-		return NattableaxisconfigurationPackage.eINSTANCE;

-	}

-} // NattableaxisconfigurationFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+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.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+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.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implements NattableaxisconfigurationFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableaxisconfigurationFactory init() {
+		try {
+			NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);
+			if (theNattableaxisconfigurationFactory != null) {
+				return theNattableaxisconfigurationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableaxisconfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableaxisconfigurationPackage.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$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
+				return convertAxisIndexStyleToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerRepresentation createAxisManagerRepresentation() {
+		AxisManagerRepresentationImpl axisManagerRepresentation = new AxisManagerRepresentationImpl();
+		return axisManagerRepresentation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerConfiguration createAxisManagerConfiguration() {
+		AxisManagerConfigurationImpl axisManagerConfiguration = new AxisManagerConfigurationImpl();
+		return axisManagerConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableHeaderAxisConfiguration createTableHeaderAxisConfiguration() {
+		TableHeaderAxisConfigurationImpl tableHeaderAxisConfiguration = new TableHeaderAxisConfigurationImpl();
+		return tableHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration() {
+		LocalTableHeaderAxisConfigurationImpl localTableHeaderAxisConfiguration = new LocalTableHeaderAxisConfigurationImpl();
+		return localTableHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureAxisConfiguration createFeatureAxisConfiguration() {
+		FeatureAxisConfigurationImpl featureAxisConfiguration = new FeatureAxisConfigurationImpl();
+		return featureAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration() {
+		EStructuralFeatureValueFillingConfigurationImpl eStructuralFeatureValueFillingConfiguration = new EStructuralFeatureValueFillingConfigurationImpl();
+		return eStructuralFeatureValueFillingConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IPasteConfiguration createIPasteConfiguration() {
+		IPasteConfigurationImpl iPasteConfiguration = new IPasteConfigurationImpl();
+		return iPasteConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public PasteEObjectConfiguration createPasteEObjectConfiguration() {
+		PasteEObjectConfigurationImpl pasteEObjectConfiguration = new PasteEObjectConfigurationImpl();
+		return pasteEObjectConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TreeFillingConfiguration createTreeFillingConfiguration() {
+		TreeFillingConfigurationImpl treeFillingConfiguration = new TreeFillingConfigurationImpl();
+		return treeFillingConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisIndexStyle createAxisIndexStyleFromString(EDataType eDataType, String initialValue) {
+		AxisIndexStyle result = AxisIndexStyle.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertAxisIndexStyleToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisconfigurationPackage getNattableaxisconfigurationPackage() {
+		return (NattableaxisconfigurationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableaxisconfigurationPackage getPackage() {
+		return NattableaxisconfigurationPackage.eINSTANCE;
+	}
+} // NattableaxisconfigurationFactoryImpl
diff --git a/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 9e6a8f53999..26f03afbd32 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
@@ -1,157 +1,157 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Header Axis Configuration</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements TableHeaderAxisConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getAxisManagers() <em>Axis Managers</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManagers()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<AxisManagerRepresentation> axisManagers;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableHeaderAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AxisManagerRepresentation> getAxisManagers() {

-		if (axisManagers == null) {

-			axisManagers = new EObjectContainmentEList<AxisManagerRepresentation>(AxisManagerRepresentation.class, this, NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

-		}

-		return axisManagers;

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				return getAxisManagers();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				getAxisManagers().clear();

-				getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eIsSet(featureID);

-	}

-} // TableHeaderAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Header Axis Configuration</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements TableHeaderAxisConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getAxisManagers() <em>Axis Managers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManagers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AxisManagerRepresentation> axisManagers;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableHeaderAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AxisManagerRepresentation> getAxisManagers() {
+		if (axisManagers == null) {
+			axisManagers = new EObjectContainmentEList<AxisManagerRepresentation>(AxisManagerRepresentation.class, this, NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);
+		}
+		return axisManagers;
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				return getAxisManagers();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				getAxisManagers().clear();
+				getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eIsSet(featureID);
+	}
+} // TableHeaderAxisConfigurationImpl
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 ee01a5d8ecb..4ad02f3b304 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
@@ -1,504 +1,504 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-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.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Tree Filling Configuration</b></em>'.

- * <!-- 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#getFilterRule <em>Filter Rule</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class TreeFillingConfigurationImpl extends StyledElementImpl implements TreeFillingConfiguration {

-

-	/**

-	 * 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

-	 */

-	protected IAxis axisUsedAsAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getPasteConfiguration() <em>Paste Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPasteConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected PasteEObjectConfiguration pasteConfiguration;

-

-	/**

-	 * The default value of the '{@link #getDepth() <em>Depth</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDepth()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int DEPTH_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getDepth() <em>Depth</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDepth()

-	 * @generated

-	 * @ordered

-	 */

-	protected int depth = DEPTH_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getLabelProvider() <em>Label Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected ILabelProviderConfiguration labelProvider;

-

-	/**

-	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getFilterRule() <em>Filter Rule</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFilterRule()

-	 * @generated

-	 * @ordered

-	 */

-	protected IBooleanEObjectExpression filterRule;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeFillingConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IAxis getAxisUsedAsAxisProvider() {

-		return axisUsedAsAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider, NotificationChain msgs) {

-		IAxis oldAxisUsedAsAxisProvider = axisUsedAsAxisProvider;

-		axisUsedAsAxisProvider = newAxisUsedAsAxisProvider;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider) {

-		if (newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {

-			NotificationChain msgs = 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)

-				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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public PasteEObjectConfiguration getPasteConfiguration() {

-		if (pasteConfiguration != null && pasteConfiguration.eIsProxy()) {

-			InternalEObject oldPasteConfiguration = (InternalEObject)pasteConfiguration;

-			pasteConfiguration = (PasteEObjectConfiguration)eResolveProxy(oldPasteConfiguration);

-			if (pasteConfiguration != oldPasteConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));

-			}

-		}

-		return pasteConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public PasteEObjectConfiguration basicGetPasteConfiguration() {

-		return pasteConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setPasteConfiguration(PasteEObjectConfiguration newPasteConfiguration) {

-		PasteEObjectConfiguration oldPasteConfiguration = pasteConfiguration;

-		pasteConfiguration = newPasteConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getDepth() {

-		return depth;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDepth(int newDepth) {

-		int oldDepth = depth;

-		depth = newDepth;

-		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()) {

-			InternalEObject oldLabelProvider = (InternalEObject)labelProvider;

-			labelProvider = (ILabelProviderConfiguration)eResolveProxy(oldLabelProvider);

-			if (labelProvider != oldLabelProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));

-			}

-		}

-		return labelProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ILabelProviderConfiguration basicGetLabelProvider() {

-		return labelProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLabelProvider(ILabelProviderConfiguration newLabelProvider) {

-		ILabelProviderConfiguration oldLabelProvider = labelProvider;

-		labelProvider = newLabelProvider;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLabelProviderContext() {

-		return labelProviderContext;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLabelProviderContext(String newLabelProviderContext) {

-		String oldLabelProviderContext = labelProviderContext;

-		labelProviderContext = newLabelProviderContext;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IBooleanEObjectExpression getFilterRule() {

-		return filterRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetFilterRule(IBooleanEObjectExpression newFilterRule, NotificationChain msgs) {

-		IBooleanEObjectExpression oldFilterRule = filterRule;

-		filterRule = newFilterRule;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, oldFilterRule, newFilterRule);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setFilterRule(IBooleanEObjectExpression newFilterRule) {

-		if (newFilterRule != filterRule) {

-			NotificationChain msgs = null;

-			if (filterRule != null)

-				msgs = ((InternalEObject)filterRule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);

-			if (newFilterRule != null)

-				msgs = ((InternalEObject)newFilterRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);

-			msgs = basicSetFilterRule(newFilterRule, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, newFilterRule, newFilterRule));

-	}

-

-	/**

-	 * <!-- 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);

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				return basicSetFilterRule(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.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();

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				return getFilterRule();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.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;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				setFilterRule((IBooleanEObjectExpression)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				setFilterRule((IBooleanEObjectExpression)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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);

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				return filterRule != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (depth: "); //$NON-NLS-1$

-		result.append(depth);

-		result.append(", labelProviderContext: "); //$NON-NLS-1$

-		result.append(labelProviderContext);

-		result.append(')');

-		return result.toString();

-	}

-} // TreeFillingConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+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.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Tree Filling Configuration</b></em>'.
+ * <!-- 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#getFilterRule <em>Filter Rule</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TreeFillingConfigurationImpl extends StyledElementImpl implements TreeFillingConfiguration {
+
+	/**
+	 * 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
+	 */
+	protected IAxis axisUsedAsAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getPasteConfiguration() <em>Paste Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPasteConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected PasteEObjectConfiguration pasteConfiguration;
+
+	/**
+	 * The default value of the '{@link #getDepth() <em>Depth</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDepth()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int DEPTH_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getDepth() <em>Depth</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDepth()
+	 * @generated
+	 * @ordered
+	 */
+	protected int depth = DEPTH_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLabelProvider() <em>Label Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected ILabelProviderConfiguration labelProvider;
+
+	/**
+	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getFilterRule() <em>Filter Rule</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFilterRule()
+	 * @generated
+	 * @ordered
+	 */
+	protected IBooleanEObjectExpression filterRule;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeFillingConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IAxis getAxisUsedAsAxisProvider() {
+		return axisUsedAsAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider, NotificationChain msgs) {
+		IAxis oldAxisUsedAsAxisProvider = axisUsedAsAxisProvider;
+		axisUsedAsAxisProvider = newAxisUsedAsAxisProvider;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider) {
+		if (newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {
+			NotificationChain msgs = 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)
+				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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public PasteEObjectConfiguration getPasteConfiguration() {
+		if (pasteConfiguration != null && pasteConfiguration.eIsProxy()) {
+			InternalEObject oldPasteConfiguration = (InternalEObject)pasteConfiguration;
+			pasteConfiguration = (PasteEObjectConfiguration)eResolveProxy(oldPasteConfiguration);
+			if (pasteConfiguration != oldPasteConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));
+			}
+		}
+		return pasteConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PasteEObjectConfiguration basicGetPasteConfiguration() {
+		return pasteConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPasteConfiguration(PasteEObjectConfiguration newPasteConfiguration) {
+		PasteEObjectConfiguration oldPasteConfiguration = pasteConfiguration;
+		pasteConfiguration = newPasteConfiguration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getDepth() {
+		return depth;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDepth(int newDepth) {
+		int oldDepth = depth;
+		depth = newDepth;
+		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()) {
+			InternalEObject oldLabelProvider = (InternalEObject)labelProvider;
+			labelProvider = (ILabelProviderConfiguration)eResolveProxy(oldLabelProvider);
+			if (labelProvider != oldLabelProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));
+			}
+		}
+		return labelProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ILabelProviderConfiguration basicGetLabelProvider() {
+		return labelProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLabelProvider(ILabelProviderConfiguration newLabelProvider) {
+		ILabelProviderConfiguration oldLabelProvider = labelProvider;
+		labelProvider = newLabelProvider;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLabelProviderContext() {
+		return labelProviderContext;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLabelProviderContext(String newLabelProviderContext) {
+		String oldLabelProviderContext = labelProviderContext;
+		labelProviderContext = newLabelProviderContext;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IBooleanEObjectExpression getFilterRule() {
+		return filterRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFilterRule(IBooleanEObjectExpression newFilterRule, NotificationChain msgs) {
+		IBooleanEObjectExpression oldFilterRule = filterRule;
+		filterRule = newFilterRule;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, oldFilterRule, newFilterRule);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFilterRule(IBooleanEObjectExpression newFilterRule) {
+		if (newFilterRule != filterRule) {
+			NotificationChain msgs = null;
+			if (filterRule != null)
+				msgs = ((InternalEObject)filterRule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);
+			if (newFilterRule != null)
+				msgs = ((InternalEObject)newFilterRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);
+			msgs = basicSetFilterRule(newFilterRule, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, newFilterRule, newFilterRule));
+	}
+
+	/**
+	 * <!-- 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);
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				return basicSetFilterRule(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.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();
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				return getFilterRule();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.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;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				setFilterRule((IBooleanEObjectExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				setFilterRule((IBooleanEObjectExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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);
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				return filterRule != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (depth: "); //$NON-NLS-1$
+		result.append(depth);
+		result.append(", labelProviderContext: "); //$NON-NLS-1$
+		result.append(labelProviderContext);
+		result.append(')');
+		return result.toString();
+	}
+} // TreeFillingConfigurationImpl
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 bbeccf8dda1..037e19af17c 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
@@ -1,373 +1,373 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-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.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationSwitch<Adapter> modelSwitch = new NattableaxisconfigurationSwitch<Adapter>() {

-			@Override

-			public Adapter 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.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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

-	 */

-	public Adapter createAbstractHeaderAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createAxisManagerRepresentationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createAxisManagerConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createTableHeaderAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createIAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createFeatureAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createIFillingConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createIPasteConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createPasteEObjectConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createTreeFillingConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableaxisconfigurationAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+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.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationSwitch<Adapter> modelSwitch = new NattableaxisconfigurationSwitch<Adapter>() {
+			@Override
+			public Adapter 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.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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
+	 */
+	public Adapter createAbstractHeaderAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createAxisManagerRepresentationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createAxisManagerConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createTableHeaderAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createIAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createFeatureAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createIFillingConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createIPasteConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createPasteEObjectConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createTreeFillingConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableaxisconfigurationAdapterFactory
diff --git a/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 33145894e0e..8fe4458c7c9 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
@@ -1,427 +1,427 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-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.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public class NattableaxisconfigurationSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_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);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisManagerRepresentation(AxisManagerRepresentation object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager 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>Axis Manager Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisManagerConfiguration(AxisManagerConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IAxis 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>IAxis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIAxisConfiguration(IAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IFilling 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>IFilling Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIFillingConfiguration(IFillingConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling 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>EStructural Feature Value Filling Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IPaste 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>IPaste Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIPasteConfiguration(IPasteConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Paste EObject 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>Paste EObject Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T casePasteEObjectConfiguration(PasteEObjectConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Tree Filling 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>Tree Filling Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTreeFillingConfiguration(TreeFillingConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableaxisconfigurationSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+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.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_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);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisManagerRepresentation(AxisManagerRepresentation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager 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>Axis Manager Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisManagerConfiguration(AxisManagerConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IAxis 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>IAxis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIAxisConfiguration(IAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IFilling 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>IFilling Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIFillingConfiguration(IFillingConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling 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>EStructural Feature Value Filling Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IPaste 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>IPaste Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIPasteConfiguration(IPasteConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Paste EObject 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>Paste EObject Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePasteEObjectConfiguration(PasteEObjectConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Tree Filling 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>Tree Filling Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTreeFillingConfiguration(TreeFillingConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableaxisconfigurationSwitch
diff --git a/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 9961f51a80f..afe01628522 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
@@ -1,349 +1,349 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.EObjectValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-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.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * 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;

-

-	/**

-	 * 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;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  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;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(abstractHeaderAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- 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;

-		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);

-		return result;

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisManagerConfiguration(AxisManagerConfiguration axisManagerConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(axisManagerConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- 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;

-		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 &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * 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 | ( (axisManagers->excluding (am1))->forAll(am2 : AxisManagerRepresentation | am1.axisManagerId<>am2.axisManagerId) ))"; //$NON-NLS-1$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(localTableHeaderAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIAxisConfiguration(IAxisConfiguration iAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateFeatureAxisConfiguration(FeatureAxisConfiguration featureAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(featureAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIFillingConfiguration(IFillingConfiguration iFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(eStructuralFeatureValueFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIPasteConfiguration(IPasteConfiguration iPasteConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iPasteConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validatePasteEObjectConfiguration(PasteEObjectConfiguration pasteEObjectConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(pasteEObjectConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTreeFillingConfiguration(TreeFillingConfiguration treeFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(treeFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisIndexStyle(AxisIndexStyle axisIndexStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-} // NattableaxisconfigurationValidator

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+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.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Validator</b> for the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * 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;
+
+	/**
+	 * 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;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationValidator() {
+		super();
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  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;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(abstractHeaderAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- 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;
+		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);
+		return result;
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAxisManagerConfiguration(AxisManagerConfiguration axisManagerConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(axisManagerConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- 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;
+		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 &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * 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 | ( (axisManagers->excluding (am1))->forAll(am2 : AxisManagerRepresentation | am1.axisManagerId<>am2.axisManagerId) ))"; //$NON-NLS-1$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(localTableHeaderAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateIAxisConfiguration(IAxisConfiguration iAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(iAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateFeatureAxisConfiguration(FeatureAxisConfiguration featureAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(featureAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateIFillingConfiguration(IFillingConfiguration iFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(iFillingConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(eStructuralFeatureValueFillingConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateIPasteConfiguration(IPasteConfiguration iPasteConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(iPasteConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validatePasteEObjectConfiguration(PasteEObjectConfiguration pasteEObjectConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(pasteEObjectConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTreeFillingConfiguration(TreeFillingConfiguration treeFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(treeFillingConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAxisIndexStyle(AxisIndexStyle axisIndexStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+} // NattableaxisconfigurationValidator
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 6cdfde7b473..214b831dfc6 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
@@ -1,48 +1,48 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract Element for the AxisProvider. This one only provides a method getAxis().

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractAxisProvider extends TableNamedElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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

-	 */

-	EList<IAxis> getAxis();

-} // AbstractAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract Element for the AxisProvider. This one only provides a method getAxis().
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractAxisProvider extends TableNamedElement {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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
+	 */
+	EList<IAxis> getAxis();
+} // AbstractAxisProvider
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 12d96f4da30..9dd2325a730 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
@@ -1,55 +1,55 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * AbstractAxisProvider. This one owns IAxis

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider()

- * @model abstract="true"

- * @generated

- */

-public interface AxisProvider extends AbstractAxisProvider {

-

-	/**

-	 * Returns the value of the '<em><b>Axis</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	@Override

-	EList<IAxis> getAxis();

-} // AxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * AbstractAxisProvider. This one owns IAxis
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AxisProvider extends AbstractAxisProvider {
+
+	/**
+	 * Returns the value of the '<em><b>Axis</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	@Override
+	EList<IAxis> getAxis();
+} // AxisProvider
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 7ef3974469d..042a025fe3f 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
@@ -1,81 +1,81 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IMaster Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * 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#getSources <em>Sources</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IMasterAxisProvider extends AxisProvider {

-

-	/**

-	 * Returns the value of the '<em><b>Disconnect Slave</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	boolean isDisconnectSlave();

-

-	/**

-	 * 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.

-	 * @see #isDisconnectSlave()

-	 * @generated

-	 */

-	void setDisconnectSlave(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Sources</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field is used by Matrix Table. it replaces the context of the table as provider for the axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Sources</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_Sources()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<IWrapper> getSources();

-} // IMasterAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IMaster Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * 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#getSources <em>Sources</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IMasterAxisProvider extends AxisProvider {
+
+	/**
+	 * Returns the value of the '<em><b>Disconnect Slave</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	boolean isDisconnectSlave();
+
+	/**
+	 * 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.
+	 * @see #isDisconnectSlave()
+	 * @generated
+	 */
+	void setDisconnectSlave(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Sources</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field is used by Matrix Table. it replaces the context of the table as provider for the axis.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Sources</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_Sources()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<IWrapper> getSources();
+} // IMasterAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
index d009135208e..1c71b07da04 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ISlave Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Interface used to distinghuish the master from the slave axis provider.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getISlaveAxisProvider()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ISlaveAxisProvider extends AxisProvider {

-} // ISlaveAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ISlave Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Interface used to distinghuish the master from the slave axis provider.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getISlaveAxisProvider()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ISlaveAxisProvider extends AxisProvider {
+} // ISlaveAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
index aae3cec2be7..ec90f3780b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Master Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Concret implementation of IMasterAxisProvider

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getMasterObjectAxisProvider()

- * @model

- * @generated

- */

-public interface MasterObjectAxisProvider extends IMasterAxisProvider {

-} // MasterObjectAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Master Object Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Concret implementation of IMasterAxisProvider
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getMasterObjectAxisProvider()
+ * @model
+ * @generated
+ */
+public interface MasterObjectAxisProvider extends IMasterAxisProvider {
+} // MasterObjectAxisProvider
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 648fc39977b..90404f6ed7c 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
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

- * @generated

- */

-public interface NattableaxisproviderFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Slave Object Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Slave Object Axis Provider</em>'.

-	 * @generated

-	 */

-	SlaveObjectAxisProvider createSlaveObjectAxisProvider();

-

-	/**

-	 * 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

-	 */

-	MasterObjectAxisProvider createMasterObjectAxisProvider();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableaxisproviderPackage getNattableaxisproviderPackage();

-} // NattableaxisproviderFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
+ * @generated
+ */
+public interface NattableaxisproviderFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Slave Object Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Slave Object Axis Provider</em>'.
+	 * @generated
+	 */
+	SlaveObjectAxisProvider createSlaveObjectAxisProvider();
+
+	/**
+	 * 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
+	 */
+	MasterObjectAxisProvider createMasterObjectAxisProvider();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableaxisproviderPackage getNattableaxisproviderPackage();
+} // NattableaxisproviderFactory
diff --git a/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 093bd62d509..4edefb75b0a 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
@@ -1,1026 +1,1026 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory

- * @model kind="package"

- * @generated

- */

-public interface NattableaxisproviderPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableaxisprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableaxisprovider"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()

-	 * @generated

-	 */

-	int ABSTRACT_AXIS_PROVIDER = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The number of structural features of the '<em>Abstract Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Abstract Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT = 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.

-	 * <!-- 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

-	 */

-	int AXIS_PROVIDER = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__EANNOTATIONS = ABSTRACT_AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__STYLES = ABSTRACT_AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__DESCRIPTION = ABSTRACT_AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__NAME = ABSTRACT_AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__AXIS = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER_FEATURE_COUNT = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_EANNOTATION__STRING = ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___CREATE_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_AXIS = ABSTRACT_AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int IMASTER_AXIS_PROVIDER = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__SOURCES = AXIS_PROVIDER_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>IMaster Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int ISLAVE_AXIS_PROVIDER = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The number of structural features of the '<em>ISlave Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER = 4;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__EANNOTATIONS = ISLAVE_AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__STYLES = ISLAVE_AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__DESCRIPTION = ISLAVE_AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__NAME = ISLAVE_AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__AXIS = ISLAVE_AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The number of structural features of the '<em>Slave Object Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = ISLAVE_AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_AXIS = ISLAVE_AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER = 5;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__EANNOTATIONS = IMASTER_AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__STYLES = IMASTER_AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__DESCRIPTION = IMASTER_AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__NAME = IMASTER_AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__AXIS = IMASTER_AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE = IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE;

-

-	/**

-	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__SOURCES = IMASTER_AXIS_PROVIDER__SOURCES;

-

-	/**

-	 * The number of structural features of the '<em>Master Object Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = IMASTER_AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_AXIS = IMASTER_AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * 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>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Abstract Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider

-	 * @generated

-	 */

-	EClass getAbstractAxisProvider();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis() <em>Get Axis</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Axis</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()

-	 * @generated

-	 */

-	EOperation getAbstractAxisProvider__GetAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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

-	 */

-	EClass getIMasterAxisProvider();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getIMasterAxisProvider_DisconnectSlave();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources <em>Sources</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Sources</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources()

-	 * @see #getIMasterAxisProvider()

-	 * @generated

-	 */

-	EReference getIMasterAxisProvider_Sources();

-

-	/**

-	 * 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

-	 */

-	EClass getISlaveAxisProvider();

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	EClass getSlaveObjectAxisProvider();

-

-	/**

-	 * 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

-	 */

-	EClass getMasterObjectAxisProvider();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableaxisproviderFactory getNattableaxisproviderFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()

-		 * @generated

-		 */

-		EClass ABSTRACT_AXIS_PROVIDER = eINSTANCE.getAbstractAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>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.

-		 * <!-- 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

-		 */

-		EClass IMASTER_AXIS_PROVIDER = eINSTANCE.getIMasterAxisProvider();

-

-		/**

-		 * 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 '<em><b>Sources</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference IMASTER_AXIS_PROVIDER__SOURCES = eINSTANCE.getIMasterAxisProvider_Sources();

-

-		/**

-		 * 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass AXIS_PROVIDER = eINSTANCE.getAxisProvider();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass MASTER_OBJECT_AXIS_PROVIDER = eINSTANCE.getMasterObjectAxisProvider();

-	}

-} // NattableaxisproviderPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattableaxisproviderPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableaxisprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableaxisprovider"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()
+	 * @generated
+	 */
+	int ABSTRACT_AXIS_PROVIDER = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Abstract Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT = 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.
+	 * <!-- 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
+	 */
+	int AXIS_PROVIDER = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__EANNOTATIONS = ABSTRACT_AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__STYLES = ABSTRACT_AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__DESCRIPTION = ABSTRACT_AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__NAME = ABSTRACT_AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__AXIS = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER_FEATURE_COUNT = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_EANNOTATION__STRING = ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___CREATE_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_AXIS = ABSTRACT_AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int IMASTER_AXIS_PROVIDER = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__SOURCES = AXIS_PROVIDER_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>IMaster Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int ISLAVE_AXIS_PROVIDER = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The number of structural features of the '<em>ISlave Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER = 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__EANNOTATIONS = ISLAVE_AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__STYLES = ISLAVE_AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__DESCRIPTION = ISLAVE_AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__NAME = ISLAVE_AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__AXIS = ISLAVE_AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The number of structural features of the '<em>Slave Object Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = ISLAVE_AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_AXIS = ISLAVE_AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER = 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__EANNOTATIONS = IMASTER_AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__STYLES = IMASTER_AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__DESCRIPTION = IMASTER_AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__NAME = IMASTER_AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__AXIS = IMASTER_AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE = IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE;
+
+	/**
+	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__SOURCES = IMASTER_AXIS_PROVIDER__SOURCES;
+
+	/**
+	 * The number of structural features of the '<em>Master Object Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = IMASTER_AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_AXIS = IMASTER_AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * 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>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider
+	 * @generated
+	 */
+	EClass getAbstractAxisProvider();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis() <em>Get Axis</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Axis</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()
+	 * @generated
+	 */
+	EOperation getAbstractAxisProvider__GetAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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
+	 */
+	EClass getIMasterAxisProvider();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getIMasterAxisProvider_DisconnectSlave();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources <em>Sources</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Sources</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources()
+	 * @see #getIMasterAxisProvider()
+	 * @generated
+	 */
+	EReference getIMasterAxisProvider_Sources();
+
+	/**
+	 * 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
+	 */
+	EClass getISlaveAxisProvider();
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	EClass getSlaveObjectAxisProvider();
+
+	/**
+	 * 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
+	 */
+	EClass getMasterObjectAxisProvider();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableaxisproviderFactory getNattableaxisproviderFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()
+		 * @generated
+		 */
+		EClass ABSTRACT_AXIS_PROVIDER = eINSTANCE.getAbstractAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>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.
+		 * <!-- 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
+		 */
+		EClass IMASTER_AXIS_PROVIDER = eINSTANCE.getIMasterAxisProvider();
+
+		/**
+		 * 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 '<em><b>Sources</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IMASTER_AXIS_PROVIDER__SOURCES = eINSTANCE.getIMasterAxisProvider_Sources();
+
+		/**
+		 * 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass AXIS_PROVIDER = eINSTANCE.getAxisProvider();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass MASTER_OBJECT_AXIS_PROVIDER = eINSTANCE.getMasterObjectAxisProvider();
+	}
+} // NattableaxisproviderPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
index afbb44746b7..20817b61da8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Slave Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Concret implementation of ISlaveAxisProvider

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getSlaveObjectAxisProvider()

- * @model

- * @generated

- */

-public interface SlaveObjectAxisProvider extends ISlaveAxisProvider {

-} // SlaveObjectAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Slave Object Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Concret implementation of ISlaveAxisProvider
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getSlaveObjectAxisProvider()
+ * @model
+ * @generated
+ */
+public interface SlaveObjectAxisProvider extends ISlaveAxisProvider {
+} // SlaveObjectAxisProvider
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 a2bf773b9e3..84ca7688ced 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
@@ -1,77 +1,77 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Abstract Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl implements AbstractAxisProvider {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AbstractAxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.ABSTRACT_AXIS_PROVIDER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxis> getAxis() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:

-				return getAxis();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-} // AbstractAxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl implements AbstractAxisProvider {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractAxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.ABSTRACT_AXIS_PROVIDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxis> getAxis() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:
+				return getAxis();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+} // AbstractAxisProviderImpl
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 3319b57e1bf..778910a2009 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
@@ -1,157 +1,157 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Provider</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implements AxisProvider {

-

-	/**

-	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxis> axis;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.AXIS_PROVIDER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxis> getAxis() {

-		if (axis == null) {

-			axis = new EObjectContainmentEList<IAxis>(IAxis.class, this, NattableaxisproviderPackage.AXIS_PROVIDER__AXIS);

-		}

-		return axis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				return getAxis();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				getAxis().clear();

-				getAxis().addAll((Collection<? extends IAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				getAxis().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				return axis != null && !axis.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // AxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Provider</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implements AxisProvider {
+
+	/**
+	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxis> axis;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.AXIS_PROVIDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxis> getAxis() {
+		if (axis == null) {
+			axis = new EObjectContainmentEList<IAxis>(IAxis.class, this, NattableaxisproviderPackage.AXIS_PROVIDER__AXIS);
+		}
+		return axis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				return getAxis();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				getAxis().clear();
+				getAxis().addAll((Collection<? extends IAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				getAxis().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				return axis != null && !axis.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // AxisProviderImpl
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 3afbe932ed6..66c3a9c6bad 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
@@ -1,227 +1,227 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import java.util.Collection;

-import org.eclipse.emf.common.notify.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.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Master Object Axis Provider</b></em>'.

- * <!-- 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#getSources <em>Sources</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements MasterObjectAxisProvider {

-

-	/**

-	 * The default value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisconnectSlave()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISCONNECT_SLAVE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisconnectSlave()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean disconnectSlave = DISCONNECT_SLAVE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getSources() <em>Sources</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getSources()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IWrapper> sources;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MasterObjectAxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.MASTER_OBJECT_AXIS_PROVIDER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisconnectSlave() {

-		return disconnectSlave;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisconnectSlave(boolean newDisconnectSlave) {

-		boolean oldDisconnectSlave = disconnectSlave;

-		disconnectSlave = newDisconnectSlave;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE, oldDisconnectSlave, disconnectSlave));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EList<IWrapper> getSources() {

-		if (sources == null) {

-			sources = new EObjectContainmentEList<IWrapper>(IWrapper.class, this, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES);

-		}

-		return sources;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				return ((InternalEList<?>)getSources()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				return isDisconnectSlave();

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				return getSources();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				setDisconnectSlave((Boolean)newValue);

-				return;

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				getSources().clear();

-				getSources().addAll((Collection<? extends IWrapper>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				getSources().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				return sources != null && !sources.isEmpty();

-		}

-		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(" (disconnectSlave: "); //$NON-NLS-1$

-		result.append(disconnectSlave);

-		result.append(')');

-		return result.toString();

-	}

-} // MasterObjectAxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import java.util.Collection;
+import org.eclipse.emf.common.notify.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.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Master Object Axis Provider</b></em>'.
+ * <!-- 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#getSources <em>Sources</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements MasterObjectAxisProvider {
+
+	/**
+	 * The default value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisconnectSlave()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISCONNECT_SLAVE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisconnectSlave()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean disconnectSlave = DISCONNECT_SLAVE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSources() <em>Sources</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSources()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IWrapper> sources;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MasterObjectAxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.MASTER_OBJECT_AXIS_PROVIDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisconnectSlave() {
+		return disconnectSlave;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisconnectSlave(boolean newDisconnectSlave) {
+		boolean oldDisconnectSlave = disconnectSlave;
+		disconnectSlave = newDisconnectSlave;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE, oldDisconnectSlave, disconnectSlave));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<IWrapper> getSources() {
+		if (sources == null) {
+			sources = new EObjectContainmentEList<IWrapper>(IWrapper.class, this, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES);
+		}
+		return sources;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				return ((InternalEList<?>)getSources()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
+				return isDisconnectSlave();
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				return getSources();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
+				setDisconnectSlave((Boolean)newValue);
+				return;
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				getSources().clear();
+				getSources().addAll((Collection<? extends IWrapper>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				getSources().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				return sources != null && !sources.isEmpty();
+		}
+		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(" (disconnectSlave: "); //$NON-NLS-1$
+		result.append(disconnectSlave);
+		result.append(')');
+		return result.toString();
+	}
+} // MasterObjectAxisProviderImpl
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 d142e95558b..70280e8844a 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
@@ -1,119 +1,119 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements NattableaxisproviderFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableaxisproviderFactory init() {

-		try {

-			NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);

-			if (theNattableaxisproviderFactory != null) {

-				return theNattableaxisproviderFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableaxisproviderFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableaxisproviderPackage.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

-	public SlaveObjectAxisProvider createSlaveObjectAxisProvider() {

-		SlaveObjectAxisProviderImpl slaveObjectAxisProvider = new SlaveObjectAxisProviderImpl();

-		return slaveObjectAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public MasterObjectAxisProvider createMasterObjectAxisProvider() {

-		MasterObjectAxisProviderImpl masterObjectAxisProvider = new MasterObjectAxisProviderImpl();

-		return masterObjectAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisproviderPackage getNattableaxisproviderPackage() {

-		return (NattableaxisproviderPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableaxisproviderPackage getPackage() {

-		return NattableaxisproviderPackage.eINSTANCE;

-	}

-} // NattableaxisproviderFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements NattableaxisproviderFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableaxisproviderFactory init() {
+		try {
+			NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);
+			if (theNattableaxisproviderFactory != null) {
+				return theNattableaxisproviderFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableaxisproviderFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableaxisproviderPackage.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
+	public SlaveObjectAxisProvider createSlaveObjectAxisProvider() {
+		SlaveObjectAxisProviderImpl slaveObjectAxisProvider = new SlaveObjectAxisProviderImpl();
+		return slaveObjectAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public MasterObjectAxisProvider createMasterObjectAxisProvider() {
+		MasterObjectAxisProviderImpl masterObjectAxisProvider = new MasterObjectAxisProviderImpl();
+		return masterObjectAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisproviderPackage getNattableaxisproviderPackage() {
+		return (NattableaxisproviderPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableaxisproviderPackage getPackage() {
+		return NattableaxisproviderPackage.eINSTANCE;
+	}
+} // NattableaxisproviderFactoryImpl
diff --git a/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 fd3af98d629..cdd3c9e6fbf 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
@@ -1,407 +1,407 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-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.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderPackageImpl extends EPackageImpl implements NattableaxisproviderPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass abstractAxisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iMasterAxisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iSlaveAxisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass axisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass slaveObjectAxisProviderEClass = null;

-

-	/**

-	 * <!-- 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

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableaxisproviderPackageImpl() {

-		super(eNS_URI, NattableaxisproviderFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattableaxisproviderPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattableaxisproviderPackage init() {

-		if (isInited) return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisproviderPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		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);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableaxisproviderPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableaxisproviderPackage.eNS_URI, theNattableaxisproviderPackage);

-		return theNattableaxisproviderPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAbstractAxisProvider() {

-		return abstractAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getAbstractAxisProvider__GetAxis() {

-		return abstractAxisProviderEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIMasterAxisProvider() {

-		return iMasterAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIMasterAxisProvider_DisconnectSlave() {

-		return (EAttribute)iMasterAxisProviderEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getIMasterAxisProvider_Sources() {

-		return (EReference)iMasterAxisProviderEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getISlaveAxisProvider() {

-		return iSlaveAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAxisProvider() {

-		return axisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getAxisProvider_Axis() {

-		return (EReference)axisProviderEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getSlaveObjectAxisProvider() {

-		return slaveObjectAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getMasterObjectAxisProvider() {

-		return masterObjectAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisproviderFactory getNattableaxisproviderFactory() {

-		return (NattableaxisproviderFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		abstractAxisProviderEClass = createEClass(ABSTRACT_AXIS_PROVIDER);

-		createEOperation(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER___GET_AXIS);

-

-		iMasterAxisProviderEClass = createEClass(IMASTER_AXIS_PROVIDER);

-		createEAttribute(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE);

-		createEReference(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__SOURCES);

-

-		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

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

-		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		abstractAxisProviderEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

-		iMasterAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());

-		iSlaveAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());

-		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$

-		initEReference(getIMasterAxisProvider_Sources(), theNattablewrapperPackage.getIWrapper(), null, "sources", null, 0, -1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, 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

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+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.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderPackageImpl extends EPackageImpl implements NattableaxisproviderPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractAxisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iMasterAxisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iSlaveAxisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass axisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass slaveObjectAxisProviderEClass = null;
+
+	/**
+	 * <!-- 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
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableaxisproviderPackageImpl() {
+		super(eNS_URI, NattableaxisproviderFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattableaxisproviderPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattableaxisproviderPackage init() {
+		if (isInited) return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisproviderPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		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);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattableaxisproviderPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattableaxisproviderPackage.eNS_URI, theNattableaxisproviderPackage);
+		return theNattableaxisproviderPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAbstractAxisProvider() {
+		return abstractAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getAbstractAxisProvider__GetAxis() {
+		return abstractAxisProviderEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIMasterAxisProvider() {
+		return iMasterAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIMasterAxisProvider_DisconnectSlave() {
+		return (EAttribute)iMasterAxisProviderEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getIMasterAxisProvider_Sources() {
+		return (EReference)iMasterAxisProviderEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getISlaveAxisProvider() {
+		return iSlaveAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAxisProvider() {
+		return axisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getAxisProvider_Axis() {
+		return (EReference)axisProviderEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSlaveObjectAxisProvider() {
+		return slaveObjectAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getMasterObjectAxisProvider() {
+		return masterObjectAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisproviderFactory getNattableaxisproviderFactory() {
+		return (NattableaxisproviderFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		abstractAxisProviderEClass = createEClass(ABSTRACT_AXIS_PROVIDER);
+		createEOperation(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER___GET_AXIS);
+
+		iMasterAxisProviderEClass = createEClass(IMASTER_AXIS_PROVIDER);
+		createEAttribute(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE);
+		createEReference(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__SOURCES);
+
+		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
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		abstractAxisProviderEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());
+		iMasterAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());
+		iSlaveAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());
+		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$
+		initEReference(getIMasterAxisProvider_Sources(), theNattablewrapperPackage.getIWrapper(), null, "sources", null, 0, -1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, 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 145444dbf7a..2a9720b414f 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
@@ -1,46 +1,46 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Slave Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements SlaveObjectAxisProvider {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected SlaveObjectAxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.SLAVE_OBJECT_AXIS_PROVIDER;

-	}

-} // SlaveObjectAxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Slave Object Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements SlaveObjectAxisProvider {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SlaveObjectAxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.SLAVE_OBJECT_AXIS_PROVIDER;
+	}
+} // SlaveObjectAxisProviderImpl
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 4bd0306cd2e..814bff747e6 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
@@ -1,278 +1,278 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-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.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

- * @generated

- */

-public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderSwitch<Adapter> modelSwitch = new NattableaxisproviderSwitch<Adapter>() {

-			@Override

-			public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {

-				return createAbstractAxisProviderAdapter();

-			}

-			@Override

-			public Adapter 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.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider

-	 * @generated

-	 */

-	public Adapter createAbstractAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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

-	 */

-	public Adapter createIMasterAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createISlaveAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createSlaveObjectAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createMasterObjectAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableaxisproviderAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+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.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
+ * @generated
+ */
+public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderSwitch<Adapter> modelSwitch = new NattableaxisproviderSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {
+				return createAbstractAxisProviderAdapter();
+			}
+			@Override
+			public Adapter 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.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider
+	 * @generated
+	 */
+	public Adapter createAbstractAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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
+	 */
+	public Adapter createIMasterAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createISlaveAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createSlaveObjectAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createMasterObjectAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableaxisproviderAdapterFactory
diff --git a/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 94a27d03a3b..bf205b3e48e 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
@@ -1,305 +1,305 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-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.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

- * @generated

- */

-public class NattableaxisproviderSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER: {

-				AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;

-				T result = caseAbstractAxisProvider(abstractAxisProvider);

-				if (result == null) result = 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);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAbstractAxisProvider(AbstractAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIMasterAxisProvider(IMasterAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseISlaveAxisProvider(ISlaveAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisProvider(AxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableaxisproviderSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+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.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
+ * @generated
+ */
+public class NattableaxisproviderSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER: {
+				AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;
+				T result = caseAbstractAxisProvider(abstractAxisProvider);
+				if (result == null) result = 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);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractAxisProvider(AbstractAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIMasterAxisProvider(IMasterAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseISlaveAxisProvider(ISlaveAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisProvider(AxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableaxisproviderSwitch
diff --git a/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 0c066e5d95c..c44ff407637 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
@@ -1,107 +1,107 @@
-/**

- * 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.nattablecell;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Cell</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Cell elements used to store specific information which can't be stored in the edited model

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell()

- * @model

- * @generated

- */

-public interface Cell extends EModelElement {

-

-	/**

-	 * Returns the value of the '<em><b>Column Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	ICellAxisWrapper getColumnWrapper();

-

-	/**

-	 * 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.

-	 * @see #getColumnWrapper()

-	 * @generated

-	 */

-	void setColumnWrapper(ICellAxisWrapper value);

-

-	/**

-	 * Returns the value of the '<em><b>Row Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	ICellAxisWrapper getRowWrapper();

-

-	/**

-	 * 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.

-	 * @see #getRowWrapper()

-	 * @generated

-	 */

-	void setRowWrapper(ICellAxisWrapper value);

-

-	/**

-	 * Returns the value of the '<em><b>Problems</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<Problem> getProblems();

-} // Cell

+/**
+ * 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.nattablecell;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cell</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Cell elements used to store specific information which can't be stored in the edited model
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell()
+ * @model
+ * @generated
+ */
+public interface Cell extends EModelElement {
+
+	/**
+	 * Returns the value of the '<em><b>Column Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	ICellAxisWrapper getColumnWrapper();
+
+	/**
+	 * 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.
+	 * @see #getColumnWrapper()
+	 * @generated
+	 */
+	void setColumnWrapper(ICellAxisWrapper value);
+
+	/**
+	 * Returns the value of the '<em><b>Row Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	ICellAxisWrapper getRowWrapper();
+
+	/**
+	 * 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.
+	 * @see #getRowWrapper()
+	 * @generated
+	 */
+	void setRowWrapper(ICellAxisWrapper value);
+
+	/**
+	 * Returns the value of the '<em><b>Problems</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<Problem> getProblems();
+} // Cell
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 cd3741299e6..34dd608c857 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
@@ -1,64 +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.nattablecell;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EObject Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Wrapper for EObject

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper()

- * @model

- * @generated

- */

-public interface EObjectAxisWrapper extends ICellAxisWrapper {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	EObject getElement();

-

-	/**

-	 * 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.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(EObject value);

-} // EObjectAxisWrapper

+/**
+ * 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.nattablecell;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EObject Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Wrapper for EObject
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper()
+ * @model
+ * @generated
+ */
+public interface EObjectAxisWrapper extends ICellAxisWrapper {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	EObject getElement();
+
+	/**
+	 * 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.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(EObject value);
+} // EObjectAxisWrapper
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 1f60314f919..87d08b5caa1 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
@@ -1,43 +1,43 @@
-/**

- * 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.nattablecell;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ICell Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This class encapsulates the real axis object.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getICellAxisWrapper()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ICellAxisWrapper extends EModelElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Return the wrapped object

-	 * <!-- end-model-doc -->

-	 * @model kind="operation" required="true"

-	 * @generated

-	 */

-	Object getElement();

-} // ICellAxisWrapper

+/**
+ * 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.nattablecell;
+
+import org.eclipse.emf.ecore.EModelElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ICell Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This class encapsulates the real axis object.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getICellAxisWrapper()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ICellAxisWrapper extends EModelElement {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Return the wrapped object
+	 * <!-- end-model-doc -->
+	 * @model kind="operation" required="true"
+	 * @generated
+	 */
+	Object getElement();
+} // ICellAxisWrapper
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 b8a744a9fde..fc79a7c9445 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
@@ -1,62 +1,62 @@
-/**

- * 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.nattablecell;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Id Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Wrapper for Id

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper()

- * @model

- * @generated

- */

-public interface IdAxisWrapper extends ICellAxisWrapper {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	@Override

-	String getElement();

-

-	/**

-	 * 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.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(String value);

-} // IdAxisWrapper

+/**
+ * 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.nattablecell;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Id Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Wrapper for Id
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper()
+ * @model
+ * @generated
+ */
+public interface IdAxisWrapper extends ICellAxisWrapper {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	@Override
+	String getElement();
+
+	/**
+	 * 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.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(String value);
+} // IdAxisWrapper
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 00afcaf70b3..5eedb740a8e 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
@@ -1,70 +1,70 @@
-/**

- * 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.nattablecell;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

- * @generated

- */

-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();

-

-	/**

-	 * 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

-	 */

-	Cell createCell();

-

-	/**

-	 * 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

-	 */

-	EObjectAxisWrapper createEObjectAxisWrapper();

-

-	/**

-	 * 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

-	 */

-	IdAxisWrapper createIdAxisWrapper();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattablecellPackage getNattablecellPackage();

-} // NattablecellFactory

+/**
+ * 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.nattablecell;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage
+ * @generated
+ */
+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();
+
+	/**
+	 * 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
+	 */
+	Cell createCell();
+
+	/**
+	 * 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
+	 */
+	EObjectAxisWrapper createEObjectAxisWrapper();
+
+	/**
+	 * 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
+	 */
+	IdAxisWrapper createIdAxisWrapper();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattablecellPackage getNattablecellPackage();
+} // NattablecellFactory
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 d11400c10f9..daf1c9908a7 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
@@ -1,545 +1,545 @@
-/**

- * 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.nattablecell;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory

- * @model kind="package"

- * @generated

- */

-public interface NattablecellPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattablecell"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattablecell"; //$NON-NLS-1$

-

-	/**

-	 * 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();

-

-	/**

-	 * 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

-	 */

-	int CELL = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Column Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__COLUMN_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Row Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__ROW_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Problems</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__PROBLEMS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Cell</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int ICELL_AXIS_WRAPPER = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The number of structural features of the '<em>ICell Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER___GET_ELEMENT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int EOBJECT_AXIS_WRAPPER = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int ID_AXIS_WRAPPER = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Id Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;

-

-	/**

-	 * The number of operations of the '<em>Id Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EReference getCell_Problems();

-

-	/**

-	 * 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

-	 */

-	EClass getICellAxisWrapper();

-

-	/**

-	 * 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

-	 */

-	EOperation getICellAxisWrapper__GetElement();

-

-	/**

-	 * 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

-	 */

-	EClass getEObjectAxisWrapper();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EReference getEObjectAxisWrapper_Element();

-

-	/**

-	 * 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

-	 */

-	EClass getIdAxisWrapper();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getIdAxisWrapper_Element();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattablecellFactory getNattablecellFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-		 */

-		EClass CELL = eINSTANCE.getCell();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass ICELL_AXIS_WRAPPER = eINSTANCE.getICellAxisWrapper();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass EOBJECT_AXIS_WRAPPER = eINSTANCE.getEObjectAxisWrapper();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass ID_AXIS_WRAPPER = eINSTANCE.getIdAxisWrapper();

-

-		/**

-		 * 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();

-	}

-} // NattablecellPackage

+/**
+ * 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.nattablecell;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattablecellPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattablecell"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattablecell"; //$NON-NLS-1$
+
+	/**
+	 * 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();
+
+	/**
+	 * 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
+	 */
+	int CELL = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Column Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__COLUMN_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Row Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__ROW_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Problems</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__PROBLEMS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Cell</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int ICELL_AXIS_WRAPPER = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The number of structural features of the '<em>ICell Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER___GET_ELEMENT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int EOBJECT_AXIS_WRAPPER = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int ID_AXIS_WRAPPER = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Id Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;
+
+	/**
+	 * The number of operations of the '<em>Id Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EReference getCell_Problems();
+
+	/**
+	 * 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
+	 */
+	EClass getICellAxisWrapper();
+
+	/**
+	 * 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
+	 */
+	EOperation getICellAxisWrapper__GetElement();
+
+	/**
+	 * 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
+	 */
+	EClass getEObjectAxisWrapper();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EReference getEObjectAxisWrapper_Element();
+
+	/**
+	 * 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
+	 */
+	EClass getIdAxisWrapper();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getIdAxisWrapper_Element();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattablecellFactory getNattablecellFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+		 */
+		EClass CELL = eINSTANCE.getCell();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass ICELL_AXIS_WRAPPER = eINSTANCE.getICellAxisWrapper();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass EOBJECT_AXIS_WRAPPER = eINSTANCE.getEObjectAxisWrapper();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass ID_AXIS_WRAPPER = eINSTANCE.getIdAxisWrapper();
+
+		/**
+		 * 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();
+	}
+} // NattablecellPackage
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 c2f3dfa720f..5f6ad99bbda 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
@@ -1,297 +1,297 @@
-/**

- * 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.nattablecell.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.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Cell</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected ICellAxisWrapper columnWrapper;

-

-	/**

-	 * The cached value of the '{@link #getRowWrapper() <em>Row Wrapper</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getRowWrapper()

-	 * @generated

-	 * @ordered

-	 */

-	protected ICellAxisWrapper rowWrapper;

-

-	/**

-	 * The cached value of the '{@link #getProblems() <em>Problems</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getProblems()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Problem> problems;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected CellImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablecellPackage.Literals.CELL;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ICellAxisWrapper getColumnWrapper() {

-		return columnWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetColumnWrapper(ICellAxisWrapper newColumnWrapper, NotificationChain msgs) {

-		ICellAxisWrapper oldColumnWrapper = columnWrapper;

-		columnWrapper = newColumnWrapper;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, oldColumnWrapper, newColumnWrapper);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setColumnWrapper(ICellAxisWrapper newColumnWrapper) {

-		if (newColumnWrapper != columnWrapper) {

-			NotificationChain msgs = null;

-			if (columnWrapper != null)

-				msgs = ((InternalEObject)columnWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ICellAxisWrapper getRowWrapper() {

-		return rowWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetRowWrapper(ICellAxisWrapper newRowWrapper, NotificationChain msgs) {

-		ICellAxisWrapper oldRowWrapper = rowWrapper;

-		rowWrapper = newRowWrapper;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, oldRowWrapper, newRowWrapper);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setRowWrapper(ICellAxisWrapper newRowWrapper) {

-		if (newRowWrapper != rowWrapper) {

-			NotificationChain msgs = null;

-			if (rowWrapper != null)

-				msgs = ((InternalEObject)rowWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Problem> getProblems() {

-		if (problems == null) {

-			problems = new EObjectContainmentEList<Problem>(Problem.class, this, NattablecellPackage.CELL__PROBLEMS);

-		}

-		return problems;

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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 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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eIsSet(featureID);

-	}

-} // CellImpl

+/**
+ * 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.nattablecell.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.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cell</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected ICellAxisWrapper columnWrapper;
+
+	/**
+	 * The cached value of the '{@link #getRowWrapper() <em>Row Wrapper</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRowWrapper()
+	 * @generated
+	 * @ordered
+	 */
+	protected ICellAxisWrapper rowWrapper;
+
+	/**
+	 * The cached value of the '{@link #getProblems() <em>Problems</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getProblems()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Problem> problems;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CellImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablecellPackage.Literals.CELL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ICellAxisWrapper getColumnWrapper() {
+		return columnWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetColumnWrapper(ICellAxisWrapper newColumnWrapper, NotificationChain msgs) {
+		ICellAxisWrapper oldColumnWrapper = columnWrapper;
+		columnWrapper = newColumnWrapper;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, oldColumnWrapper, newColumnWrapper);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setColumnWrapper(ICellAxisWrapper newColumnWrapper) {
+		if (newColumnWrapper != columnWrapper) {
+			NotificationChain msgs = null;
+			if (columnWrapper != null)
+				msgs = ((InternalEObject)columnWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ICellAxisWrapper getRowWrapper() {
+		return rowWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetRowWrapper(ICellAxisWrapper newRowWrapper, NotificationChain msgs) {
+		ICellAxisWrapper oldRowWrapper = rowWrapper;
+		rowWrapper = newRowWrapper;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, oldRowWrapper, newRowWrapper);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setRowWrapper(ICellAxisWrapper newRowWrapper) {
+		if (newRowWrapper != rowWrapper) {
+			NotificationChain msgs = null;
+			if (rowWrapper != null)
+				msgs = ((InternalEObject)rowWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Problem> getProblems() {
+		if (problems == null) {
+			problems = new EObjectContainmentEList<Problem>(Problem.class, this, NattablecellPackage.CELL__PROBLEMS);
+		}
+		return problems;
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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 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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eIsSet(featureID);
+	}
+} // CellImpl
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 1b27c3e1f54..bdad23f341b 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
@@ -1,166 +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.nattablecell.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EObject Axis Wrapper</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObjectAxisWrapper {

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject element;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectAxisWrapperImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getElement() {

-		if (element != null && element.eIsProxy()) {

-			InternalEObject oldElement = (InternalEObject)element;

-			element = eResolveProxy(oldElement);

-			if (element != oldElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));

-			}

-		}

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(EObject newElement) {

-		EObject oldElement = element;

-		element = newElement;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-				return element != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EObjectAxisWrapperImpl

+/**
+ * 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.nattablecell.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EObject Axis Wrapper</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObjectAxisWrapper {
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject element;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectAxisWrapperImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getElement() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject)element;
+			element = eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));
+			}
+		}
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(EObject newElement) {
+		EObject oldElement = element;
+		element = newElement;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
+				return element != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EObjectAxisWrapperImpl
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 41c34f95abe..c844b0923b0 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
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id Axis Wrapper</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrapper {

-

-	/**

-	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ELEMENT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected String element = ELEMENT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IdAxisWrapperImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablecellPackage.Literals.ID_AXIS_WRAPPER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(String newElement) {

-		String oldElement = element;

-		element = newElement;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (element: "); //$NON-NLS-1$

-		result.append(element);

-		result.append(')');

-		return result.toString();

-	}

-} // IdAxisWrapperImpl

+/**
+ * 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.nattablecell.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Id Axis Wrapper</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrapper {
+
+	/**
+	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ELEMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected String element = ELEMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdAxisWrapperImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablecellPackage.Literals.ID_AXIS_WRAPPER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(String newElement) {
+		String oldElement = element;
+		element = newElement;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (element: "); //$NON-NLS-1$
+		result.append(element);
+		result.append(')');
+		return result.toString();
+	}
+} // IdAxisWrapperImpl
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 f61cec7aede..79c51e796ff 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
@@ -1,132 +1,132 @@
-/**

- * 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.nattablecell.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellFactoryImpl extends EFactoryImpl implements NattablecellFactory {

-

-	/**

-	 * 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) {

-				return theNattablecellFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattablecellFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Cell createCell() {

-		CellImpl cell = new CellImpl();

-		return cell;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectAxisWrapper createEObjectAxisWrapper() {

-		EObjectAxisWrapperImpl eObjectAxisWrapper = new EObjectAxisWrapperImpl();

-		return eObjectAxisWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IdAxisWrapper createIdAxisWrapper() {

-		IdAxisWrapperImpl idAxisWrapper = new IdAxisWrapperImpl();

-		return idAxisWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablecellPackage getNattablecellPackage() {

-		return (NattablecellPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablecellPackage getPackage() {

-		return NattablecellPackage.eINSTANCE;

-	}

-} // NattablecellFactoryImpl

+/**
+ * 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.nattablecell.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellFactoryImpl extends EFactoryImpl implements NattablecellFactory {
+
+	/**
+	 * 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) {
+				return theNattablecellFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattablecellFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- 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$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Cell createCell() {
+		CellImpl cell = new CellImpl();
+		return cell;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectAxisWrapper createEObjectAxisWrapper() {
+		EObjectAxisWrapperImpl eObjectAxisWrapper = new EObjectAxisWrapperImpl();
+		return eObjectAxisWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IdAxisWrapper createIdAxisWrapper() {
+		IdAxisWrapperImpl idAxisWrapper = new IdAxisWrapperImpl();
+		return idAxisWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablecellPackage getNattablecellPackage() {
+		return (NattablecellPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablecellPackage getPackage() {
+		return NattablecellPackage.eINSTANCE;
+	}
+} // NattablecellFactoryImpl
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 124741eaa0c..a966363dad7 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
@@ -1,385 +1,385 @@
-/**

- * 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.nattablecell.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellPackageImpl extends EPackageImpl implements NattablecellPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass cellEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iCellAxisWrapperEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectAxisWrapperEClass = null;

-

-	/**

-	 * <!-- 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

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablecellPackageImpl() {

-		super(eNS_URI, NattablecellFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link 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);

-

-		// 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();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		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);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablecellPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablecellPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.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;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getCell() {

-		return cellEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getCell_ColumnWrapper() {

-		return (EReference)cellEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getCell_RowWrapper() {

-		return (EReference)cellEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getCell_Problems() {

-		return (EReference)cellEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getICellAxisWrapper() {

-		return iCellAxisWrapperEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getICellAxisWrapper__GetElement() {

-		return iCellAxisWrapperEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectAxisWrapper() {

-		return eObjectAxisWrapperEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectAxisWrapper_Element() {

-		return (EReference)eObjectAxisWrapperEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIdAxisWrapper() {

-		return idAxisWrapperEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIdAxisWrapper_Element() {

-		return (EAttribute)idAxisWrapperEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablecellFactory getNattablecellFactory() {

-		return (NattablecellFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		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$

-	}

-} // NattablecellPackageImpl

+/**
+ * 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.nattablecell.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellPackageImpl extends EPackageImpl implements NattablecellPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cellEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iCellAxisWrapperEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectAxisWrapperEClass = null;
+
+	/**
+	 * <!-- 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
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablecellPackageImpl() {
+		super(eNS_URI, NattablecellFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link 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);
+
+		// 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();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		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);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablecellPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablecellPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.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;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCell() {
+		return cellEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCell_ColumnWrapper() {
+		return (EReference)cellEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCell_RowWrapper() {
+		return (EReference)cellEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCell_Problems() {
+		return (EReference)cellEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getICellAxisWrapper() {
+		return iCellAxisWrapperEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getICellAxisWrapper__GetElement() {
+		return iCellAxisWrapperEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectAxisWrapper() {
+		return eObjectAxisWrapperEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectAxisWrapper_Element() {
+		return (EReference)eObjectAxisWrapperEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIdAxisWrapper() {
+		return idAxisWrapperEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIdAxisWrapper_Element() {
+		return (EAttribute)idAxisWrapperEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablecellFactory getNattablecellFactory() {
+		return (NattablecellFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		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$
+	}
+} // NattablecellPackageImpl
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 c8cd7785273..76c9541a4b6 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
@@ -1,202 +1,202 @@
-/**

- * 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.nattablecell.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

- * @generated

- */

-public class NattablecellAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablecellPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablecellPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected 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();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</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.Cell

-	 * @generated

-	 */

-	public Adapter createCellAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createICellAxisWrapperAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEObjectAxisWrapperAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createIdAxisWrapperAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattablecellAdapterFactory

+/**
+ * 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.nattablecell.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage
+ * @generated
+ */
+public class NattablecellAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablecellPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablecellPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected 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();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</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.Cell
+	 * @generated
+	 */
+	public Adapter createCellAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createICellAxisWrapperAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEObjectAxisWrapperAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createIdAxisWrapperAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattablecellAdapterFactory
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 2ee123be934..ea904976b46 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
@@ -1,206 +1,206 @@
-/**

- * 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.nattablecell.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

- * @generated

- */

-public class NattablecellSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablecellPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablecellPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case 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);

-				return result;

-			}

-			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;

-			}

-			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);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Cell</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>Cell</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCell(Cell object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</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>ICell Axis Wrapper</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseICellAxisWrapper(ICellAxisWrapper object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectAxisWrapper(EObjectAxisWrapper object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIdAxisWrapper(IdAxisWrapper object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattablecellSwitch

+/**
+ * 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.nattablecell.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage
+ * @generated
+ */
+public class NattablecellSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablecellPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablecellPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case 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);
+				return result;
+			}
+			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;
+			}
+			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);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cell</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>Cell</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCell(Cell object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</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>ICell Axis Wrapper</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseICellAxisWrapper(ICellAxisWrapper object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectAxisWrapper(EObjectAxisWrapper object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdAxisWrapper(IdAxisWrapper object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattablecellSwitch
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 ce52c4e243c..646178e1084 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
@@ -1,252 +1,252 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Cell Editor Declaration</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * <!-- begin-model-doc -->

- * 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

- */

-public enum CellEditorDeclaration implements Enumerator {

-	/**

-	 * The '<em><b>COLUMN</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #COLUMN_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	COLUMN(0, "COLUMN", "COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>ROW</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #ROW_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ROW(1, "ROW", "ROW"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>CELL</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #CELL_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	CELL(2, "CELL", "CELL"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>COLUMN</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #COLUMN

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int COLUMN_VALUE = 0;

-

-	/**

-	 * The '<em><b>ROW</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>ROW</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #ROW

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ROW_VALUE = 1;

-

-	/**

-	 * The '<em><b>CELL</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>CELL</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #CELL

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int CELL_VALUE = 2;

-

-	/**

-	 * An array of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[] {

-			COLUMN,

-			ROW,

-			CELL,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<CellEditorDeclaration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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) {

-			CellEditorDeclaration result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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) {

-			CellEditorDeclaration result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private CellEditorDeclaration(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // CellEditorDeclaration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Cell Editor Declaration</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * 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
+ */
+public enum CellEditorDeclaration implements Enumerator {
+	/**
+	 * The '<em><b>COLUMN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #COLUMN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	COLUMN(0, "COLUMN", "COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>ROW</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ROW_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ROW(1, "ROW", "ROW"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>CELL</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CELL_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	CELL(2, "CELL", "CELL"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>COLUMN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #COLUMN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int COLUMN_VALUE = 0;
+
+	/**
+	 * The '<em><b>ROW</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>ROW</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #ROW
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ROW_VALUE = 1;
+
+	/**
+	 * The '<em><b>CELL</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>CELL</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #CELL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int CELL_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[] {
+			COLUMN,
+			ROW,
+			CELL,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<CellEditorDeclaration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @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) {
+			CellEditorDeclaration result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @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) {
+			CellEditorDeclaration result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @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;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private CellEditorDeclaration(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // CellEditorDeclaration
diff --git a/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 6596b081db8..dc6392a212a 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
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public interface NattableconfigurationFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Table Configuration</em>'.

-	 * @generated

-	 */

-	TableConfiguration createTableConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableconfigurationPackage getNattableconfigurationPackage();

-} // NattableconfigurationFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+public interface NattableconfigurationFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table Configuration</em>'.
+	 * @generated
+	 */
+	TableConfiguration createTableConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableconfigurationPackage getNattableconfigurationPackage();
+} // NattableconfigurationFactory
diff --git a/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 9c818ad050b..a455839c675 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
@@ -1,713 +1,713 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory

- * @model kind="package"

- *        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 {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.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

-	 */

-	int TABLE_NAMED_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__DESCRIPTION = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__NAME = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Table Named Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * 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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()

-	 * @generated

-	 */

-	int TABLE_CONFIGURATION = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__EANNOTATIONS = TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__STYLES = TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__DESCRIPTION = TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__NAME = TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__TYPE = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__ICON_PATH = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Creation Tester</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__CREATION_TESTER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Cell Editor Declaration</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;

-

-	/**

-	 * The feature id for the '<em><b>Column Axis Providers</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;

-

-	/**

-	 * The feature id for the '<em><b>Row Axis Providers</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;

-

-	/**

-	 * The feature id for the '<em><b>Default Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;

-

-	/**

-	 * The feature id for the '<em><b>Default Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;

-

-	/**

-	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;

-

-	/**

-	 * The number of structural features of the '<em>Table Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION_FEATURE_COUNT = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___GET_EANNOTATION__STRING = TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___GET_STYLE__ECLASS = TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___CREATE_STYLE__ECLASS = TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * 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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()

-	 * @generated

-	 */

-	int CELL_EDITOR_DECLARATION = 2;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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

-	 */

-	EClass getTableNamedElement();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getTableNamedElement_Description();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getTableNamedElement_Name();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration

-	 * @generated

-	 */

-	EClass getTableConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Type</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EAttribute getTableConfiguration_Type();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Icon Path</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EAttribute getTableConfiguration_IconPath();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Creation Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_CreationTester();

-

-	/**

-	 * Returns the meta object for 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EReference getTableConfiguration_DefaultColumnAxisProvider();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_OwnedCellEditorConfigurations();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for enum '<em>Cell Editor Declaration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @generated

-	 */

-	EEnum getCellEditorDeclaration();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableconfigurationFactory getNattableconfigurationFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.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

-		 */

-		EClass TABLE_NAMED_ELEMENT = eINSTANCE.getTableNamedElement();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()

-		 * @generated

-		 */

-		EClass TABLE_CONFIGURATION = eINSTANCE.getTableConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_CONFIGURATION__TYPE = eINSTANCE.getTableConfiguration_Type();

-

-		/**

-		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_CONFIGURATION__ICON_PATH = eINSTANCE.getTableConfiguration_IconPath();

-

-		/**

-		 * The meta object literal for the '<em><b>Creation Tester</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__CREATION_TESTER = eINSTANCE.getTableConfiguration_CreationTester();

-

-		/**

-		 * The meta object literal for the '<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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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 '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTableConfiguration_OwnedCellEditorConfigurations();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()

-		 * @generated

-		 */

-		EEnum CELL_EDITOR_DECLARATION = eINSTANCE.getCellEditorDeclaration();

-	}

-} // NattableconfigurationPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory
+ * @model kind="package"
+ *        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 {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.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
+	 */
+	int TABLE_NAMED_ELEMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__DESCRIPTION = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__NAME = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Table Named Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * 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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()
+	 * @generated
+	 */
+	int TABLE_CONFIGURATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__EANNOTATIONS = TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__STYLES = TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__DESCRIPTION = TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__NAME = TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__TYPE = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__ICON_PATH = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Creation Tester</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__CREATION_TESTER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Cell Editor Declaration</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Column Axis Providers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Row Axis Providers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Default Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Default Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;
+
+	/**
+	 * The number of structural features of the '<em>Table Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION_FEATURE_COUNT = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___GET_EANNOTATION__STRING = TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___GET_STYLE__ECLASS = TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___CREATE_STYLE__ECLASS = TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * 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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()
+	 * @generated
+	 */
+	int CELL_EDITOR_DECLARATION = 2;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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
+	 */
+	EClass getTableNamedElement();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getTableNamedElement_Description();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getTableNamedElement_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration
+	 * @generated
+	 */
+	EClass getTableConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EAttribute getTableConfiguration_Type();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Icon Path</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EAttribute getTableConfiguration_IconPath();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Creation Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_CreationTester();
+
+	/**
+	 * Returns the meta object for 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EReference getTableConfiguration_DefaultColumnAxisProvider();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_OwnedCellEditorConfigurations();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Cell Editor Declaration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+	 * @generated
+	 */
+	EEnum getCellEditorDeclaration();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableconfigurationFactory getNattableconfigurationFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.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
+		 */
+		EClass TABLE_NAMED_ELEMENT = eINSTANCE.getTableNamedElement();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()
+		 * @generated
+		 */
+		EClass TABLE_CONFIGURATION = eINSTANCE.getTableConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_CONFIGURATION__TYPE = eINSTANCE.getTableConfiguration_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_CONFIGURATION__ICON_PATH = eINSTANCE.getTableConfiguration_IconPath();
+
+		/**
+		 * The meta object literal for the '<em><b>Creation Tester</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__CREATION_TESTER = eINSTANCE.getTableConfiguration_CreationTester();
+
+		/**
+		 * The meta object literal for the '<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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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 '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTableConfiguration_OwnedCellEditorConfigurations();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()
+		 * @generated
+		 */
+		EEnum CELL_EDITOR_DECLARATION = eINSTANCE.getCellEditorDeclaration();
+	}
+} // NattableconfigurationPackage
diff --git a/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 8989cf61cb2..508100901c0 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
@@ -1,319 +1,319 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-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.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * 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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- * </ul>

- *

- * @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-&gt;includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders-&gt;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 {

-

-	/**

-	 * Returns the value of the '<em><b>Type</b></em>' attribute.

-	 * <!-- 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. 

-	 * 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Type</em>' attribute.

-	 * @see #getType()

-	 * @generated

-	 */

-	void setType(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getIconPath();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Icon Path</em>' attribute.

-	 * @see #getIconPath()

-	 * @generated

-	 */

-	void setIconPath(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Creation Tester</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * 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()

-	 * @model containment="true"

-	 * @generated

-	 */

-	AbstractTableTester getCreationTester();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Creation Tester</em>' containment reference.

-	 * @see #getCreationTester()

-	 * @generated

-	 */

-	void setCreationTester(AbstractTableTester value);

-

-	/**

-	 * Returns the value of the '<em><b>Cell Editor Declaration</b></em>' attribute.

-	 * The default value is <code>"COLUMN"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- 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. 

-	 * 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)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CellEditorDeclaration()

-	 * @model default="COLUMN" required="true"

-	 * @generated

-	 */

-	CellEditorDeclaration getCellEditorDeclaration();

-

-	/**

-	 * 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.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @see #getCellEditorDeclaration()

-	 * @generated

-	 */

-	void setCellEditorDeclaration(CellEditorDeclaration value);

-

-	/**

-	 * Returns the value of the '<em><b>Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Row Header Axis Configuration</em>' containment reference.

-	 * @see #getRowHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Column Header Axis Configuration</em>' containment reference.

-	 * @see #getColumnHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Axis Providers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getColumnAxisProviders();

-

-	/**

-	 * Returns the value of the '<em><b>Row Axis Providers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getRowAxisProviders();

-

-	/**

-	 * Returns the value of the '<em><b>Default Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Default Row Axis Provider</em>' reference.

-	 * @see #getDefaultRowAxisProvider()

-	 * @generated

-	 */

-	void setDefaultRowAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Default Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Default Column Axis Provider</em>' reference.

-	 * @see #getDefaultColumnAxisProvider()

-	 * @generated

-	 */

-	void setDefaultColumnAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * In some case (Matrix Table for example), the table can have celleditor configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_OwnedCellEditorConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ICellEditorConfiguration getOwnedCellEditorConfigurations();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 */

-	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);

-} // TableConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+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.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * 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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ * </ul>
+ *
+ * @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-&gt;includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders-&gt;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 {
+
+	/**
+	 * Returns the value of the '<em><b>Type</b></em>' attribute.
+	 * <!-- 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. 
+	 * 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * @see #getType()
+	 * @generated
+	 */
+	void setType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getIconPath();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Icon Path</em>' attribute.
+	 * @see #getIconPath()
+	 * @generated
+	 */
+	void setIconPath(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Creation Tester</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractTableTester getCreationTester();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Creation Tester</em>' containment reference.
+	 * @see #getCreationTester()
+	 * @generated
+	 */
+	void setCreationTester(AbstractTableTester value);
+
+	/**
+	 * Returns the value of the '<em><b>Cell Editor Declaration</b></em>' attribute.
+	 * The default value is <code>"COLUMN"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- 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. 
+	 * 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)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CellEditorDeclaration()
+	 * @model default="COLUMN" required="true"
+	 * @generated
+	 */
+	CellEditorDeclaration getCellEditorDeclaration();
+
+	/**
+	 * 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.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+	 * @see #getCellEditorDeclaration()
+	 * @generated
+	 */
+	void setCellEditorDeclaration(CellEditorDeclaration value);
+
+	/**
+	 * Returns the value of the '<em><b>Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Row Header Axis Configuration</em>' containment reference.
+	 * @see #getRowHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Column Header Axis Configuration</em>' containment reference.
+	 * @see #getColumnHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Column Axis Providers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getColumnAxisProviders();
+
+	/**
+	 * Returns the value of the '<em><b>Row Axis Providers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getRowAxisProviders();
+
+	/**
+	 * Returns the value of the '<em><b>Default Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Row Axis Provider</em>' reference.
+	 * @see #getDefaultRowAxisProvider()
+	 * @generated
+	 */
+	void setDefaultRowAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Default Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Column Axis Provider</em>' reference.
+	 * @see #getDefaultColumnAxisProvider()
+	 * @generated
+	 */
+	void setDefaultColumnAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * In some case (Matrix Table for example), the table can have celleditor configuration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_OwnedCellEditorConfigurations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ICellEditorConfiguration getOwnedCellEditorConfigurations();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 */
+	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);
+} // TableConfiguration
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 e095183d3fa..24457b079cb 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
@@ -1,91 +1,91 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Named Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract Element used in this metamodel for named element which have a description.

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement()

- * @model abstract="true"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyName'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyName='not (name.oclIsUndefined() or name = \'\')'"

- * @generated

- */

-public interface TableNamedElement extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * 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.

-	 * @see #getDescription()

-	 * @generated

-	 */

-	void setDescription(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * 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.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-} // TableNamedElement

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Named Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract Element used in this metamodel for named element which have a description.
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement()
+ * @model abstract="true"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyName'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyName='not (name.oclIsUndefined() or name = \'\')'"
+ * @generated
+ */
+public interface TableNamedElement extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * 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.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * 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.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+} // TableNamedElement
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 0729bbb0861..508dca9b47f 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
@@ -1,158 +1,158 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationFactoryImpl extends EFactoryImpl implements NattableconfigurationFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableconfigurationFactory init() {

-		try {

-			NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);

-			if (theNattableconfigurationFactory != null) {

-				return theNattableconfigurationFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableconfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION: return createTableConfiguration();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-				return createCellEditorDeclarationFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-				return convertCellEditorDeclarationToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableConfiguration createTableConfiguration() {

-		TableConfigurationImpl tableConfiguration = new TableConfigurationImpl();

-		return tableConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public CellEditorDeclaration createCellEditorDeclarationFromString(EDataType eDataType, String initialValue) {

-		CellEditorDeclaration result = CellEditorDeclaration.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertCellEditorDeclarationToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableconfigurationPackage getNattableconfigurationPackage() {

-		return (NattableconfigurationPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableconfigurationPackage getPackage() {

-		return NattableconfigurationPackage.eINSTANCE;

-	}

-} // NattableconfigurationFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationFactoryImpl extends EFactoryImpl implements NattableconfigurationFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableconfigurationFactory init() {
+		try {
+			NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);
+			if (theNattableconfigurationFactory != null) {
+				return theNattableconfigurationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableconfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION: return createTableConfiguration();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
+				return createCellEditorDeclarationFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
+				return convertCellEditorDeclarationToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableConfiguration createTableConfiguration() {
+		TableConfigurationImpl tableConfiguration = new TableConfigurationImpl();
+		return tableConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CellEditorDeclaration createCellEditorDeclarationFromString(EDataType eDataType, String initialValue) {
+		CellEditorDeclaration result = CellEditorDeclaration.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCellEditorDeclarationToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableconfigurationPackage getNattableconfigurationPackage() {
+		return (NattableconfigurationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableconfigurationPackage getPackage() {
+		return NattableconfigurationPackage.eINSTANCE;
+	}
+} // NattableconfigurationFactoryImpl
diff --git a/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 68a5b6927a4..572152ca7a2 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
@@ -1,524 +1,524 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationPackageImpl extends EPackageImpl implements NattableconfigurationPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableNamedElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EEnum cellEditorDeclarationEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableconfigurationPackageImpl() {

-		super(eNS_URI, NattableconfigurationFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattableconfigurationPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattableconfigurationPackage init() {

-		if (isInited) return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableconfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		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);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableconfigurationPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-			(theNattableconfigurationPackage, 

-			 new EValidator.Descriptor() {

-				 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;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTableNamedElement() {

-		return tableNamedElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableNamedElement_Description() {

-		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableNamedElement_Name() {

-		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTableConfiguration() {

-		return tableConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableConfiguration_Type() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableConfiguration_IconPath() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_CreationTester() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableConfiguration_CellEditorDeclaration() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_RowHeaderAxisConfiguration() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_ColumnHeaderAxisConfiguration() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_ColumnAxisProviders() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_RowAxisProviders() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_DefaultRowAxisProvider() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_DefaultColumnAxisProvider() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_OwnedCellEditorConfigurations() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(10);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EEnum getCellEditorDeclaration() {

-		return cellEditorDeclarationEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableconfigurationFactory getNattableconfigurationFactory() {

-		return (NattableconfigurationFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		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);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__CREATION_TESTER);

-		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS);

-

-		// Create enums

-		cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		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);

-		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.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$

-		initEReference(getTableConfiguration_CreationTester(), theNattabletesterPackage.getAbstractTableTester(), null, "creationTester", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTableConfiguration_CellEditorDeclaration(), this.getCellEditorDeclaration(), "cellEditorDeclaration", "COLUMN", 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getTableConfiguration_RowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "rowHeaderAxisConfiguration", 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_ColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "columnHeaderAxisConfiguration", 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_ColumnAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProviders", 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_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$

-		initEReference(getTableConfiguration_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Initialize enums and add enum literals

-		initEEnum(cellEditorDeclarationEEnum, CellEditorDeclaration.class, "CellEditorDeclaration"); //$NON-NLS-1$

-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.COLUMN);

-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.ROW);

-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.CELL);

-

-		// Create annotations

-		// http://www.eclipse.org/emf/2002/Ecore

-		createEcoreAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot

-		createPivotAnnotations();

-	}

-

-	/**

-	 * 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$

-		   });

-	}

-

-	/**

-	 * 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$

-		   });

-	}

-} // NattableconfigurationPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationPackageImpl extends EPackageImpl implements NattableconfigurationPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableNamedElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum cellEditorDeclarationEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableconfigurationPackageImpl() {
+		super(eNS_URI, NattableconfigurationFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattableconfigurationPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattableconfigurationPackage init() {
+		if (isInited) return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableconfigurationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		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);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableconfigurationPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Register package validator
+		EValidator.Registry.INSTANCE.put
+			(theNattableconfigurationPackage, 
+			 new EValidator.Descriptor() {
+				 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;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTableNamedElement() {
+		return tableNamedElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableNamedElement_Description() {
+		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableNamedElement_Name() {
+		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTableConfiguration() {
+		return tableConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableConfiguration_Type() {
+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableConfiguration_IconPath() {
+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_CreationTester() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableConfiguration_CellEditorDeclaration() {
+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_RowHeaderAxisConfiguration() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_ColumnHeaderAxisConfiguration() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_ColumnAxisProviders() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_RowAxisProviders() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_DefaultRowAxisProvider() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_DefaultColumnAxisProvider() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTableConfiguration_OwnedCellEditorConfigurations() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCellEditorDeclaration() {
+		return cellEditorDeclarationEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableconfigurationFactory getNattableconfigurationFactory() {
+		return (NattableconfigurationFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		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);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__CREATION_TESTER);
+		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS);
+
+		// Create enums
+		cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		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);
+		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.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$
+		initEReference(getTableConfiguration_CreationTester(), theNattabletesterPackage.getAbstractTableTester(), null, "creationTester", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTableConfiguration_CellEditorDeclaration(), this.getCellEditorDeclaration(), "cellEditorDeclaration", "COLUMN", 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getTableConfiguration_RowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "rowHeaderAxisConfiguration", 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_ColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "columnHeaderAxisConfiguration", 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_ColumnAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProviders", 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_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$
+		initEReference(getTableConfiguration_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		// Initialize enums and add enum literals
+		initEEnum(cellEditorDeclarationEEnum, CellEditorDeclaration.class, "CellEditorDeclaration"); //$NON-NLS-1$
+		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.COLUMN);
+		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.ROW);
+		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.CELL);
+
+		// Create annotations
+		// http://www.eclipse.org/emf/2002/Ecore
+		createEcoreAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot
+		createPivotAnnotations();
+	}
+
+	/**
+	 * 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$
+		   });
+	}
+
+	/**
+	 * 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$
+		   });
+	}
+} // 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 8819e5e95c0..babf0471749 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
@@ -1,776 +1,776 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import java.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.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-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.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class TableConfigurationImpl extends TableNamedElementImpl implements TableConfiguration {

-

-	/**

-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getType()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TYPE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getType()

-	 * @generated

-	 * @ordered

-	 */

-	protected String type = TYPE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIconPath()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ICON_PATH_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIconPath()

-	 * @generated

-	 * @ordered

-	 */

-	protected String iconPath = ICON_PATH_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getCreationTester() <em>Creation Tester</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCreationTester()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractTableTester creationTester;

-

-	/**

-	 * The default value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCellEditorDeclaration()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final CellEditorDeclaration CELL_EDITOR_DECLARATION_EDEFAULT = CellEditorDeclaration.COLUMN;

-

-	/**

-	 * The cached value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCellEditorDeclaration()

-	 * @generated

-	 * @ordered

-	 */

-	protected CellEditorDeclaration cellEditorDeclaration = CELL_EDITOR_DECLARATION_EDEFAULT;

-

-	/**

-	 * 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

-	 */

-	protected TableHeaderAxisConfiguration rowHeaderAxisConfiguration;

-

-	/**

-	 * 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

-	 */

-	protected TableHeaderAxisConfiguration columnHeaderAxisConfiguration;

-

-	/**

-	 * 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

-	 */

-	protected EList<AbstractAxisProvider> columnAxisProviders;

-

-	/**

-	 * 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

-	 */

-	protected EList<AbstractAxisProvider> rowAxisProviders;

-

-	/**

-	 * The cached value of the '{@link #getDefaultRowAxisProvider() <em>Default Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDefaultRowAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider defaultRowAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getDefaultColumnAxisProvider() <em>Default Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDefaultColumnAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider defaultColumnAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected ICellEditorConfiguration ownedCellEditorConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableconfigurationPackage.Literals.TABLE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getType() {

-		return type;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setType(String newType) {

-		String oldType = type;

-		type = newType;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getIconPath() {

-		return iconPath;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setIconPath(String newIconPath) {

-		String oldIconPath = iconPath;

-		iconPath = newIconPath;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractTableTester getCreationTester() {

-		return creationTester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetCreationTester(AbstractTableTester newCreationTester, NotificationChain msgs) {

-		AbstractTableTester oldCreationTester = creationTester;

-		creationTester = newCreationTester;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, oldCreationTester, newCreationTester);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setCreationTester(AbstractTableTester newCreationTester) {

-		if (newCreationTester != creationTester) {

-			NotificationChain msgs = null;

-			if (creationTester != null)

-				msgs = ((InternalEObject)creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);

-			if (newCreationTester != null)

-				msgs = ((InternalEObject)newCreationTester).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);

-			msgs = basicSetCreationTester(newCreationTester, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, newCreationTester, newCreationTester));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public CellEditorDeclaration getCellEditorDeclaration() {

-		return cellEditorDeclaration;

-	}

-

-	/**

-	 * <!-- 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())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION, oldCellEditorDeclaration, cellEditorDeclaration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableHeaderAxisConfiguration getRowHeaderAxisConfiguration() {

-		return rowHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration, NotificationChain msgs) {

-		TableHeaderAxisConfiguration oldRowHeaderAxisConfiguration = rowHeaderAxisConfiguration;

-		rowHeaderAxisConfiguration = newRowHeaderAxisConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration) {

-		if (newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (rowHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)rowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration() {

-		return columnHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration, NotificationChain msgs) {

-		TableHeaderAxisConfiguration oldColumnHeaderAxisConfiguration = columnHeaderAxisConfiguration;

-		columnHeaderAxisConfiguration = newColumnHeaderAxisConfiguration;

-		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);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration) {

-		if (newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (columnHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)columnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			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));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getColumnAxisProviders() {

-		if (columnAxisProviders == null) {

-			columnAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);

-		}

-		return columnAxisProviders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getRowAxisProviders() {

-		if (rowAxisProviders == null) {

-			rowAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);

-		}

-		return rowAxisProviders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractAxisProvider getDefaultRowAxisProvider() {

-		if (defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {

-			InternalEObject oldDefaultRowAxisProvider = (InternalEObject)defaultRowAxisProvider;

-			defaultRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultRowAxisProvider);

-			if (defaultRowAxisProvider != oldDefaultRowAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));

-			}

-		}

-		return defaultRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetDefaultRowAxisProvider() {

-		return defaultRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDefaultRowAxisProvider(AbstractAxisProvider newDefaultRowAxisProvider) {

-		AbstractAxisProvider oldDefaultRowAxisProvider = defaultRowAxisProvider;

-		defaultRowAxisProvider = newDefaultRowAxisProvider;

-		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()) {

-			InternalEObject oldDefaultColumnAxisProvider = (InternalEObject)defaultColumnAxisProvider;

-			defaultColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultColumnAxisProvider);

-			if (defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));

-			}

-		}

-		return defaultColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetDefaultColumnAxisProvider() {

-		return defaultColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDefaultColumnAxisProvider(AbstractAxisProvider newDefaultColumnAxisProvider) {

-		AbstractAxisProvider oldDefaultColumnAxisProvider = defaultColumnAxisProvider;

-		defaultColumnAxisProvider = newDefaultColumnAxisProvider;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {

-		return ownedCellEditorConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {

-		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;

-		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {

-		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {

-			NotificationChain msgs = null;

-			if (ownedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			if (newOwnedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));

-	}

-

-	/**

-	 * <!-- 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);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return basicSetOwnedCellEditorConfigurations(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-				return getType();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-				return getIconPath();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				return getCreationTester();

-			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();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return getOwnedCellEditorConfigurations();

-		}

-		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 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;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-				setType(TYPE_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-				setIconPath(ICON_PATH_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				setCreationTester((AbstractTableTester)null);

-				return;

-			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;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-				return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				return creationTester != null;

-			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;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return ownedCellEditorConfigurations != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (type: "); //$NON-NLS-1$

-		result.append(type);

-		result.append(", iconPath: "); //$NON-NLS-1$

-		result.append(iconPath);

-		result.append(", cellEditorDeclaration: "); //$NON-NLS-1$

-		result.append(cellEditorDeclaration);

-		result.append(')');

-		return result.toString();

-	}

-} // TableConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import java.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.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+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.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </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#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TableConfigurationImpl extends TableNamedElementImpl implements TableConfiguration {
+
+	/**
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String type = TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ICON_PATH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected String iconPath = ICON_PATH_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getCreationTester() <em>Creation Tester</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCreationTester()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractTableTester creationTester;
+
+	/**
+	 * The default value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCellEditorDeclaration()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CellEditorDeclaration CELL_EDITOR_DECLARATION_EDEFAULT = CellEditorDeclaration.COLUMN;
+
+	/**
+	 * The cached value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCellEditorDeclaration()
+	 * @generated
+	 * @ordered
+	 */
+	protected CellEditorDeclaration cellEditorDeclaration = CELL_EDITOR_DECLARATION_EDEFAULT;
+
+	/**
+	 * 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
+	 */
+	protected TableHeaderAxisConfiguration rowHeaderAxisConfiguration;
+
+	/**
+	 * 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
+	 */
+	protected TableHeaderAxisConfiguration columnHeaderAxisConfiguration;
+
+	/**
+	 * 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
+	 */
+	protected EList<AbstractAxisProvider> columnAxisProviders;
+
+	/**
+	 * 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
+	 */
+	protected EList<AbstractAxisProvider> rowAxisProviders;
+
+	/**
+	 * The cached value of the '{@link #getDefaultRowAxisProvider() <em>Default Row Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultRowAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider defaultRowAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getDefaultColumnAxisProvider() <em>Default Column Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultColumnAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider defaultColumnAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected ICellEditorConfiguration ownedCellEditorConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableconfigurationPackage.Literals.TABLE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setType(String newType) {
+		String oldType = type;
+		type = newType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getIconPath() {
+		return iconPath;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIconPath(String newIconPath) {
+		String oldIconPath = iconPath;
+		iconPath = newIconPath;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractTableTester getCreationTester() {
+		return creationTester;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCreationTester(AbstractTableTester newCreationTester, NotificationChain msgs) {
+		AbstractTableTester oldCreationTester = creationTester;
+		creationTester = newCreationTester;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, oldCreationTester, newCreationTester);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCreationTester(AbstractTableTester newCreationTester) {
+		if (newCreationTester != creationTester) {
+			NotificationChain msgs = null;
+			if (creationTester != null)
+				msgs = ((InternalEObject)creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
+			if (newCreationTester != null)
+				msgs = ((InternalEObject)newCreationTester).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
+			msgs = basicSetCreationTester(newCreationTester, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, newCreationTester, newCreationTester));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CellEditorDeclaration getCellEditorDeclaration() {
+		return cellEditorDeclaration;
+	}
+
+	/**
+	 * <!-- 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())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION, oldCellEditorDeclaration, cellEditorDeclaration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableHeaderAxisConfiguration getRowHeaderAxisConfiguration() {
+		return rowHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration, NotificationChain msgs) {
+		TableHeaderAxisConfiguration oldRowHeaderAxisConfiguration = rowHeaderAxisConfiguration;
+		rowHeaderAxisConfiguration = newRowHeaderAxisConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration) {
+		if (newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (rowHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)rowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration() {
+		return columnHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration, NotificationChain msgs) {
+		TableHeaderAxisConfiguration oldColumnHeaderAxisConfiguration = columnHeaderAxisConfiguration;
+		columnHeaderAxisConfiguration = newColumnHeaderAxisConfiguration;
+		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);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration) {
+		if (newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (columnHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)columnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+			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));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getColumnAxisProviders() {
+		if (columnAxisProviders == null) {
+			columnAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);
+		}
+		return columnAxisProviders;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getRowAxisProviders() {
+		if (rowAxisProviders == null) {
+			rowAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
+		}
+		return rowAxisProviders;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractAxisProvider getDefaultRowAxisProvider() {
+		if (defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {
+			InternalEObject oldDefaultRowAxisProvider = (InternalEObject)defaultRowAxisProvider;
+			defaultRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultRowAxisProvider);
+			if (defaultRowAxisProvider != oldDefaultRowAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));
+			}
+		}
+		return defaultRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetDefaultRowAxisProvider() {
+		return defaultRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDefaultRowAxisProvider(AbstractAxisProvider newDefaultRowAxisProvider) {
+		AbstractAxisProvider oldDefaultRowAxisProvider = defaultRowAxisProvider;
+		defaultRowAxisProvider = newDefaultRowAxisProvider;
+		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()) {
+			InternalEObject oldDefaultColumnAxisProvider = (InternalEObject)defaultColumnAxisProvider;
+			defaultColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultColumnAxisProvider);
+			if (defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));
+			}
+		}
+		return defaultColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetDefaultColumnAxisProvider() {
+		return defaultColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDefaultColumnAxisProvider(AbstractAxisProvider newDefaultColumnAxisProvider) {
+		AbstractAxisProvider oldDefaultColumnAxisProvider = defaultColumnAxisProvider;
+		defaultColumnAxisProvider = newDefaultColumnAxisProvider;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {
+		return ownedCellEditorConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {
+		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;
+		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {
+		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {
+			NotificationChain msgs = null;
+			if (ownedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			if (newOwnedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));
+	}
+
+	/**
+	 * <!-- 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);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return basicSetOwnedCellEditorConfigurations(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+				return getType();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+				return getIconPath();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				return getCreationTester();
+			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();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return getOwnedCellEditorConfigurations();
+		}
+		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 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;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+				setType(TYPE_EDEFAULT);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+				setIconPath(ICON_PATH_EDEFAULT);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				setCreationTester((AbstractTableTester)null);
+				return;
+			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;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+				return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				return creationTester != null;
+			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;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return ownedCellEditorConfigurations != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (type: "); //$NON-NLS-1$
+		result.append(type);
+		result.append(", iconPath: "); //$NON-NLS-1$
+		result.append(iconPath);
+		result.append(", cellEditorDeclaration: "); //$NON-NLS-1$
+		result.append(cellEditorDeclaration);
+		result.append(')');
+		return result.toString();
+	}
+} // TableConfigurationImpl
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 e15442d4f8e..b6a8567b2ef 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
@@ -1,228 +1,228 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Named Element</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public abstract class TableNamedElementImpl extends StyledElementImpl implements TableNamedElement {

-

-	/**

-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String DESCRIPTION_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected String description = DESCRIPTION_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableNamedElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDescription(String newDescription) {

-		String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION, oldDescription, description));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-				setDescription((String)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-				setName((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-				setDescription(DESCRIPTION_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-				setName(NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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(" (description: "); //$NON-NLS-1$

-		result.append(description);

-		result.append(", name: "); //$NON-NLS-1$

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-} // TableNamedElementImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Named Element</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class TableNamedElementImpl extends StyledElementImpl implements TableNamedElement {
+
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableNamedElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION, oldDescription, description));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+				setDescription((String)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
+				setName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+				setDescription(DESCRIPTION_EDEFAULT);
+				return;
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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(" (description: "); //$NON-NLS-1$
+		result.append(description);
+		result.append(", name: "); //$NON-NLS-1$
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+} // TableNamedElementImpl
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 42050b7d1c6..11bd42d17a2 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
@@ -1,183 +1,183 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationSwitch<Adapter> modelSwitch = new NattableconfigurationSwitch<Adapter>() {

-			@Override

-			public Adapter 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.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration

-	 * @generated

-	 */

-	public Adapter createTableConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableconfigurationAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationSwitch<Adapter> modelSwitch = new NattableconfigurationSwitch<Adapter>() {
+			@Override
+			public Adapter 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.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration
+	 * @generated
+	 */
+	public Adapter createTableConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableconfigurationAdapterFactory
diff --git a/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 b1dd442682b..9be2321017a 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
@@ -1,177 +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.nattableconfiguration.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public class NattableconfigurationSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableconfigurationPackage.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);

-				if (result == null) result = caseEModelElement(tableConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableConfiguration(TableConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableconfigurationSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;
+
+import org.eclipse.emf.ecore.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.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+public class NattableconfigurationSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableconfigurationPackage.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);
+				if (result == null) result = caseEModelElement(tableConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableConfiguration(TableConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableconfigurationSwitch
diff --git a/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 1fd0793aab8..3108b60ef47 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
@@ -1,350 +1,350 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.EObjectValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * 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;

-

-	/**

-	 * 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;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  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;

-		}

-	}

-

-	/**

-	 * <!-- 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;

-		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);

-		return result;

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- 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;

-		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);

-		return result;

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateCellEditorDeclaration(CellEditorDeclaration cellEditorDeclaration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-} // NattableconfigurationValidator

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Validator</b> for the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * 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;
+
+	/**
+	 * 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;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationValidator() {
+		super();
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  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;
+		}
+	}
+
+	/**
+	 * <!-- 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;
+		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);
+		return result;
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- 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;
+		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);
+		return result;
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateCellEditorDeclaration(CellEditorDeclaration cellEditorDeclaration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+} // NattableconfigurationValidator
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 949d43003a5..d8fc536864d 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
@@ -1,150 +1,150 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- 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>

- * <!-- 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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration()

- * @model

- * @generated

- */

-public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Display Is Derived</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIsDerived();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Is Derived</em>' attribute.

-	 * @see #isDisplayIsDerived()

-	 * @generated

-	 */

-	void setDisplayIsDerived(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Type</em>' attribute.

-	 * @see #isDisplayType()

-	 * @generated

-	 */

-	void setDisplayType(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayMultiplicity();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 */

-	void setDisplayMultiplicity(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Name</em>' attribute.

-	 * @see #isDisplayName()

-	 * @generated

-	 */

-	void setDisplayName(boolean value);

-} // FeatureLabelProviderConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- 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>
+ * <!-- 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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration()
+ * @model
+ * @generated
+ */
+public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Display Is Derived</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayIsDerived();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Is Derived</em>' attribute.
+	 * @see #isDisplayIsDerived()
+	 * @generated
+	 */
+	void setDisplayIsDerived(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Type</em>' attribute.
+	 * @see #isDisplayType()
+	 * @generated
+	 */
+	void setDisplayType(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayMultiplicity();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 */
+	void setDisplayMultiplicity(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Name</em>' attribute.
+	 * @see #isDisplayName()
+	 * @generated
+	 */
+	void setDisplayName(boolean value);
+} // FeatureLabelProviderConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
index 69bf3332ee7..8b0622466fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
@@ -1,32 +1,32 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ILabel Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Common Interface for LabelProviderConfiguration

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelProviderConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ILabelProviderConfiguration extends StyledElement {

-} // ILabelProviderConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ILabel Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Common Interface for LabelProviderConfiguration
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelProviderConfiguration()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ILabelProviderConfiguration extends StyledElement {
+} // ILabelProviderConfiguration
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 3c22bcc6cf5..caca37957c2 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
@@ -1,70 +1,70 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

- * @generated

- */

-public interface NattablelabelproviderFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablelabelproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Feature Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Feature Label Provider Configuration</em>'.

-	 * @generated

-	 */

-	FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Object Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Object Label Provider Configuration</em>'.

-	 * @generated

-	 */

-	ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration();

-

-	/**

-	 * Returns 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

-	 */

-	NattablelabelproviderPackage getNattablelabelproviderPackage();

-} // NattablelabelproviderFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
+ * @generated
+ */
+public interface NattablelabelproviderFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablelabelproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Feature Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Feature Label Provider Configuration</em>'.
+	 * @generated
+	 */
+	FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Object Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Object Label Provider Configuration</em>'.
+	 * @generated
+	 */
+	ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration();
+
+	/**
+	 * Returns 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
+	 */
+	NattablelabelproviderPackage getNattablelabelproviderPackage();
+} // NattablelabelproviderFactory
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 7807099c069..216135c8fef 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
@@ -1,790 +1,790 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory

- * @model kind="package"

- * @generated

- */

-public interface NattablelabelproviderPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattablelabelprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattablelabelprovider"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablelabelproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The number of structural features of the '<em>ILabel Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * 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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()

-	 * @generated

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = ILABEL_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 OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES = ILABEL_PROVIDER_CONFIGURATION__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Object Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = ILABEL_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 OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = ILABEL_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 OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;

-

-	/**

-	 * 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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_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 FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;

-

-	/**

-	 * The feature id for the '<em><b>Display Is Derived</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Display Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;

-

-	/**

-	 * The number of structural features of the '<em>Feature Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 4;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_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 FEATURE_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 FEATURE_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;

-

-	/**

-	 * 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;

-

-	/**

-	 * 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

-	 */

-	EClass getILabelProviderConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Feature Label Provider Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

-	 * @generated

-	 */

-	EClass getFeatureLabelProviderConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Is Derived</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Type</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayType();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Name</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayName();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Object Label Provider Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

-	 * @generated

-	 */

-	EClass getObjectLabelProviderConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Icon</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon()

-	 * @see #getObjectLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getObjectLabelProviderConfiguration_DisplayIcon();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Label</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel()

-	 * @see #getObjectLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getObjectLabelProviderConfiguration_DisplayLabel();

-

-	/**

-	 * Returns the 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

-	 */

-	NattablelabelproviderFactory getNattablelabelproviderFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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

-		 */

-		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.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()

-		 * @generated

-		 */

-		EClass FEATURE_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getFeatureLabelProviderConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Is Derived</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()

-		 * @generated

-		 */

-		EClass OBJECT_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getObjectLabelProviderConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Icon</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

-

-		/**

-		 * 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

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattablelabelproviderPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattablelabelprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattablelabelprovider"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablelabelproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The number of structural features of the '<em>ILabel Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * 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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()
+	 * @generated
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = ILABEL_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 OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES = ILABEL_PROVIDER_CONFIGURATION__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Object Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = ILABEL_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 OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = ILABEL_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 OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;
+
+	/**
+	 * 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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_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 FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;
+
+	/**
+	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>Display Is Derived</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Display Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Feature Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 4;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_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 FEATURE_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 FEATURE_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;
+
+	/**
+	 * 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;
+
+	/**
+	 * 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
+	 */
+	EClass getILabelProviderConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Feature Label Provider Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
+	 * @generated
+	 */
+	EClass getFeatureLabelProviderConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Is Derived</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Type</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Name</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Object Label Provider Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
+	 * @generated
+	 */
+	EClass getObjectLabelProviderConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Icon</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon()
+	 * @see #getObjectLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getObjectLabelProviderConfiguration_DisplayIcon();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Label</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel()
+	 * @see #getObjectLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getObjectLabelProviderConfiguration_DisplayLabel();
+
+	/**
+	 * Returns the 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
+	 */
+	NattablelabelproviderFactory getNattablelabelproviderFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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
+		 */
+		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.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()
+		 * @generated
+		 */
+		EClass FEATURE_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getFeatureLabelProviderConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Is Derived</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()
+		 * @generated
+		 */
+		EClass OBJECT_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getObjectLabelProviderConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Icon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
+
+		/**
+		 * 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 b63c9832a92..8c51868319c 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
@@ -1,91 +1,91 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- 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>

- * <!-- 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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()

- * @model

- * @generated

- */

-public interface ObjectLabelProviderConfiguration extends ILabelProviderConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Display Icon</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIcon();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Icon</em>' attribute.

-	 * @see #isDisplayIcon()

-	 * @generated

-	 */

-	void setDisplayIcon(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayLabel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Label</em>' attribute.

-	 * @see #isDisplayLabel()

-	 * @generated

-	 */

-	void setDisplayLabel(boolean value);

-} // ObjectLabelProviderConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- 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>
+ * <!-- 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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()
+ * @model
+ * @generated
+ */
+public interface ObjectLabelProviderConfiguration extends ILabelProviderConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Display Icon</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayIcon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Icon</em>' attribute.
+	 * @see #isDisplayIcon()
+	 * @generated
+	 */
+	void setDisplayIcon(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayLabel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Label</em>' attribute.
+	 * @see #isDisplayLabel()
+	 * @generated
+	 */
+	void setDisplayLabel(boolean value);
+} // ObjectLabelProviderConfiguration
diff --git a/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
index 68e146d7678..adbd0e43134 100644
--- 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
@@ -1,127 +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

+/**
+ * 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 3a9b9986449..aed72507ac0 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
@@ -1,339 +1,339 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </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>

- * </ul>

- *

- * @generated

- */

-public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {

-

-	/**

-	 * The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIsDerived()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_IS_DERIVED_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIsDerived()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayIsDerived = DISPLAY_IS_DERIVED_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayType()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayType()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_NAME_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayName()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayName = DISPLAY_NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureLabelProviderConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayIsDerived() {

-		return displayIsDerived;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayIsDerived(boolean newDisplayIsDerived) {

-		boolean oldDisplayIsDerived = displayIsDerived;

-		displayIsDerived = newDisplayIsDerived;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED, oldDisplayIsDerived, displayIsDerived));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayType() {

-		return displayType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayType(boolean newDisplayType) {

-		boolean oldDisplayType = displayType;

-		displayType = newDisplayType;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayMultiplicity() {

-		return displayMultiplicity;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {

-		boolean oldDisplayMultiplicity = displayMultiplicity;

-		displayMultiplicity = newDisplayMultiplicity;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayName() {

-		return displayName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayName(boolean newDisplayName) {

-		boolean oldDisplayName = displayName;

-		displayName = newDisplayName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				return isDisplayIsDerived();

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				return isDisplayType();

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				return isDisplayMultiplicity();

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				return isDisplayName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				setDisplayIsDerived((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				setDisplayType((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				setDisplayMultiplicity((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				setDisplayName((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				setDisplayType(DISPLAY_TYPE_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				setDisplayName(DISPLAY_NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				return displayType != DISPLAY_TYPE_EDEFAULT;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				return displayName != DISPLAY_NAME_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (displayIsDerived: "); //$NON-NLS-1$

-		result.append(displayIsDerived);

-		result.append(", displayType: "); //$NON-NLS-1$

-		result.append(displayType);

-		result.append(", displayMultiplicity: "); //$NON-NLS-1$

-		result.append(displayMultiplicity);

-		result.append(", displayName: "); //$NON-NLS-1$

-		result.append(displayName);

-		result.append(')');

-		return result.toString();

-	}

-} // FeatureLabelProviderConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </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>
+ * </ul>
+ *
+ * @generated
+ */
+public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {
+
+	/**
+	 * The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIsDerived()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_IS_DERIVED_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIsDerived()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayIsDerived = DISPLAY_IS_DERIVED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayType()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_NAME_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureLabelProviderConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayIsDerived() {
+		return displayIsDerived;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayIsDerived(boolean newDisplayIsDerived) {
+		boolean oldDisplayIsDerived = displayIsDerived;
+		displayIsDerived = newDisplayIsDerived;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED, oldDisplayIsDerived, displayIsDerived));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayType() {
+		return displayType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayType(boolean newDisplayType) {
+		boolean oldDisplayType = displayType;
+		displayType = newDisplayType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayMultiplicity() {
+		return displayMultiplicity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {
+		boolean oldDisplayMultiplicity = displayMultiplicity;
+		displayMultiplicity = newDisplayMultiplicity;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayName() {
+		return displayName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayName(boolean newDisplayName) {
+		boolean oldDisplayName = displayName;
+		displayName = newDisplayName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				return isDisplayIsDerived();
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				return isDisplayType();
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				return isDisplayMultiplicity();
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				return isDisplayName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				setDisplayIsDerived((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				setDisplayType((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				setDisplayMultiplicity((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				setDisplayName((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				setDisplayType(DISPLAY_TYPE_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				return displayType != DISPLAY_TYPE_EDEFAULT;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				return displayName != DISPLAY_NAME_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (displayIsDerived: "); //$NON-NLS-1$
+		result.append(displayIsDerived);
+		result.append(", displayType: "); //$NON-NLS-1$
+		result.append(displayType);
+		result.append(", displayMultiplicity: "); //$NON-NLS-1$
+		result.append(displayMultiplicity);
+		result.append(", displayName: "); //$NON-NLS-1$
+		result.append(displayName);
+		result.append(')');
+		return result.toString();
+	}
+} // FeatureLabelProviderConfigurationImpl
diff --git a/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 7ad87372dcb..cf84727f6ea 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
@@ -1,131 +1,131 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

-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;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements NattablelabelproviderFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattablelabelproviderFactory init() {

-		try {

-			NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);

-			if (theNattablelabelproviderFactory != null) {

-				return theNattablelabelproviderFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattablelabelproviderFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: return createFeatureLabelProviderConfiguration();

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: return createObjectLabelProviderConfiguration();

-			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

-	public FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration() {

-		FeatureLabelProviderConfigurationImpl featureLabelProviderConfiguration = new FeatureLabelProviderConfigurationImpl();

-		return featureLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration() {

-		ObjectLabelProviderConfigurationImpl objectLabelProviderConfiguration = new ObjectLabelProviderConfigurationImpl();

-		return objectLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OperationLabelProviderConfiguration createOperationLabelProviderConfiguration() {

-		OperationLabelProviderConfigurationImpl operationLabelProviderConfiguration = new OperationLabelProviderConfigurationImpl();

-		return operationLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablelabelproviderPackage getNattablelabelproviderPackage() {

-		return (NattablelabelproviderPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablelabelproviderPackage getPackage() {

-		return NattablelabelproviderPackage.eINSTANCE;

-	}

-} // NattablelabelproviderFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
+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;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements NattablelabelproviderFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattablelabelproviderFactory init() {
+		try {
+			NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);
+			if (theNattablelabelproviderFactory != null) {
+				return theNattablelabelproviderFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattablelabelproviderFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: return createFeatureLabelProviderConfiguration();
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: return createObjectLabelProviderConfiguration();
+			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
+	public FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration() {
+		FeatureLabelProviderConfigurationImpl featureLabelProviderConfiguration = new FeatureLabelProviderConfigurationImpl();
+		return featureLabelProviderConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration() {
+		ObjectLabelProviderConfigurationImpl objectLabelProviderConfiguration = new ObjectLabelProviderConfigurationImpl();
+		return objectLabelProviderConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationLabelProviderConfiguration createOperationLabelProviderConfiguration() {
+		OperationLabelProviderConfigurationImpl operationLabelProviderConfiguration = new OperationLabelProviderConfigurationImpl();
+		return operationLabelProviderConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablelabelproviderPackage getNattablelabelproviderPackage() {
+		return (NattablelabelproviderPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablelabelproviderPackage getPackage() {
+		return NattablelabelproviderPackage.eINSTANCE;
+	}
+} // NattablelabelproviderFactoryImpl
diff --git a/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 f66087c01a0..7f2969e8974 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
@@ -1,413 +1,413 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-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;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderPackageImpl extends EPackageImpl implements NattablelabelproviderPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iLabelProviderConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureLabelProviderConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectLabelProviderConfigurationEClass = null;

-

-	/**

-	 * <!-- 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 -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablelabelproviderPackageImpl() {

-		super(eNS_URI, NattablelabelproviderFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattablelabelproviderPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattablelabelproviderPackage init() {

-		if (isInited) return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablelabelproviderPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		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);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattablelabelproviderPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattablelabelproviderPackage.eNS_URI, theNattablelabelproviderPackage);

-		return theNattablelabelproviderPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getILabelProviderConfiguration() {

-		return iLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureLabelProviderConfiguration() {

-		return featureLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayType() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayName() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectLabelProviderConfiguration() {

-		return objectLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {

-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {

-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- 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

-	public NattablelabelproviderFactory getNattablelabelproviderFactory() {

-		return (NattablelabelproviderFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		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

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		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

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+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;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderPackageImpl extends EPackageImpl implements NattablelabelproviderPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iLabelProviderConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureLabelProviderConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectLabelProviderConfigurationEClass = null;
+
+	/**
+	 * <!-- 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 -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablelabelproviderPackageImpl() {
+		super(eNS_URI, NattablelabelproviderFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattablelabelproviderPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattablelabelproviderPackage init() {
+		if (isInited) return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablelabelproviderPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		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);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattablelabelproviderPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattablelabelproviderPackage.eNS_URI, theNattablelabelproviderPackage);
+		return theNattablelabelproviderPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getILabelProviderConfiguration() {
+		return iLabelProviderConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureLabelProviderConfiguration() {
+		return featureLabelProviderConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayType() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayName() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectLabelProviderConfiguration() {
+		return objectLabelProviderConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {
+		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {
+		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- 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
+	public NattablelabelproviderFactory getNattablelabelproviderFactory() {
+		return (NattablelabelproviderFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		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
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		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 14cef53d024..6d9c44392c8 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
@@ -1,228 +1,228 @@
-/**

- * 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.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </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>

- * </ul>

- *

- * @generated

- */

-public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl implements ObjectLabelProviderConfiguration {

-

-	/**

-	 * The default value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIcon()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_ICON_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIcon()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayIcon = DISPLAY_ICON_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectLabelProviderConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayIcon() {

-		return displayIcon;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayIcon(boolean newDisplayIcon) {

-		boolean oldDisplayIcon = displayIcon;

-		displayIcon = newDisplayIcon;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayLabel() {

-		return displayLabel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayLabel(boolean newDisplayLabel) {

-		boolean oldDisplayLabel = displayLabel;

-		displayLabel = newDisplayLabel;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				return isDisplayIcon();

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				return isDisplayLabel();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				setDisplayIcon((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				setDisplayLabel((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				setDisplayIcon(DISPLAY_ICON_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				return displayIcon != DISPLAY_ICON_EDEFAULT;

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				return displayLabel != DISPLAY_LABEL_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (displayIcon: "); //$NON-NLS-1$

-		result.append(displayIcon);

-		result.append(", displayLabel: "); //$NON-NLS-1$

-		result.append(displayLabel);

-		result.append(')');

-		return result.toString();

-	}

-} // ObjectLabelProviderConfigurationImpl

+/**
+ * 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.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </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>
+ * </ul>
+ *
+ * @generated
+ */
+public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl implements ObjectLabelProviderConfiguration {
+
+	/**
+	 * The default value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_ICON_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayIcon = DISPLAY_ICON_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectLabelProviderConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayIcon() {
+		return displayIcon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayIcon(boolean newDisplayIcon) {
+		boolean oldDisplayIcon = displayIcon;
+		displayIcon = newDisplayIcon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayLabel() {
+		return displayLabel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayLabel(boolean newDisplayLabel) {
+		boolean oldDisplayLabel = displayLabel;
+		displayLabel = newDisplayLabel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				return isDisplayIcon();
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				return isDisplayLabel();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				setDisplayIcon((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				setDisplayLabel((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				setDisplayIcon(DISPLAY_ICON_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				return displayIcon != DISPLAY_ICON_EDEFAULT;
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				return displayLabel != DISPLAY_LABEL_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (displayIcon: "); //$NON-NLS-1$
+		result.append(displayIcon);
+		result.append(", displayLabel: "); //$NON-NLS-1$
+		result.append(displayLabel);
+		result.append(')');
+		return result.toString();
+	}
+} // ObjectLabelProviderConfigurationImpl
diff --git a/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
index d203bb6103e..72f79917daf 100644
--- 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
@@ -1,280 +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

+/**
+ * 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 ebb6f3806c7..7e1a0687557 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
@@ -1,221 +1,221 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

-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;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

- * @generated

- */

-public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablelabelproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablelabelproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderSwitch<Adapter> modelSwitch = new NattablelabelproviderSwitch<Adapter>() {

-			@Override

-			public Adapter 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.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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

-	 */

-	public Adapter createILabelProviderConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

-	 * @generated

-	 */

-	public Adapter createFeatureLabelProviderConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

-	 * @generated

-	 */

-	public Adapter createObjectLabelProviderConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.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

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattablelabelproviderAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
+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;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
+ * @generated
+ */
+public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablelabelproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablelabelproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderSwitch<Adapter> modelSwitch = new NattablelabelproviderSwitch<Adapter>() {
+			@Override
+			public Adapter 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.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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
+	 */
+	public Adapter createILabelProviderConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
+	 * @generated
+	 */
+	public Adapter createFeatureLabelProviderConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
+	 * @generated
+	 */
+	public Adapter createObjectLabelProviderConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.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
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattablelabelproviderAdapterFactory
diff --git a/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 7c8fe7e82fa..7e5cff81e31 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
@@ -1,229 +1,229 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

-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;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

- * @generated

- */

-public class NattablelabelproviderSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablelabelproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablelabelproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattablelabelproviderPackage.ILABEL_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);

-				if (result == null) result = caseStyledElement(featureLabelProviderConfiguration);

-				if (result == null) result = caseEModelElement(featureLabelProviderConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: {

-				ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;

-				T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);

-				if (result == null) result = caseILabelProviderConfiguration(objectLabelProviderConfiguration);

-				if (result == null) result = caseStyledElement(objectLabelProviderConfiguration);

-				if (result == null) result = caseEModelElement(objectLabelProviderConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			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;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ILabel 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>ILabel Provider Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseILabelProviderConfiguration(ILabelProviderConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>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.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattablelabelproviderSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
+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;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
+ * @generated
+ */
+public class NattablelabelproviderSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablelabelproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablelabelproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattablelabelproviderPackage.ILABEL_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);
+				if (result == null) result = caseStyledElement(featureLabelProviderConfiguration);
+				if (result == null) result = caseEModelElement(featureLabelProviderConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: {
+				ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;
+				T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);
+				if (result == null) result = caseILabelProviderConfiguration(objectLabelProviderConfiguration);
+				if (result == null) result = caseStyledElement(objectLabelProviderConfiguration);
+				if (result == null) result = caseEModelElement(objectLabelProviderConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			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;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ILabel 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>ILabel Provider Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseILabelProviderConfiguration(ILabelProviderConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>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.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattablelabelproviderSwitch
diff --git a/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 297f6aac0b3..f3442c45a2c 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
@@ -1,61 +1,61 @@
-/**

- * 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.nattableproblem;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

- * @generated

- */

-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();

-

-	/**

-	 * 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

-	 */

-	Problem createProblem();

-

-	/**

-	 * 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

-	 */

-	StringResolutionProblem createStringResolutionProblem();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableproblemPackage getNattableproblemPackage();

-} // NattableproblemFactory

+/**
+ * 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.nattableproblem;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage
+ * @generated
+ */
+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();
+
+	/**
+	 * 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
+	 */
+	Problem createProblem();
+
+	/**
+	 * 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
+	 */
+	StringResolutionProblem createStringResolutionProblem();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableproblemPackage getNattableproblemPackage();
+} // NattableproblemFactory
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 6f09b96cec2..1624a819bbe 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
@@ -1,390 +1,390 @@
-/**

- * 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.nattableproblem;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory

- * @model kind="package"

- * @generated

- */

-public interface NattableproblemPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableproblem"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableproblem"; //$NON-NLS-1$

-

-	/**

-	 * 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();

-

-	/**

-	 * 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

-	 */

-	int PROBLEM = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The number of structural features of the '<em>Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int STRING_RESOLUTION_PROBLEM = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__EANNOTATIONS = PROBLEM__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__STYLES = PROBLEM__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__DESCRIPTION = PROBLEM__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__NAME = PROBLEM__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Value As String</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING = PROBLEM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Unresolved String</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = PROBLEM_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>String Resolution Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM_FEATURE_COUNT = PROBLEM_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___GET_EANNOTATION__STRING = PROBLEM___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = PROBLEM___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___GET_STYLE__ECLASS = PROBLEM___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___CREATE_STYLE__ECLASS = PROBLEM___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>String Resolution Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM_OPERATION_COUNT = PROBLEM_OPERATION_COUNT + 0;

-

-	/**

-	 * 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

-	 */

-	EClass getProblem();

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EAttribute getStringResolutionProblem_UnresolvedString();

-

-	/**

-	 * 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

-	 */

-	NattableproblemFactory getNattableproblemFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass STRING_RESOLUTION_PROBLEM = eINSTANCE.getStringResolutionProblem();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-	}

-} // NattableproblemPackage

+/**
+ * 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.nattableproblem;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattableproblemPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableproblem"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableproblem"; //$NON-NLS-1$
+
+	/**
+	 * 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();
+
+	/**
+	 * 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
+	 */
+	int PROBLEM = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The number of structural features of the '<em>Problem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int STRING_RESOLUTION_PROBLEM = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__EANNOTATIONS = PROBLEM__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__STYLES = PROBLEM__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__DESCRIPTION = PROBLEM__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__NAME = PROBLEM__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Value As String</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING = PROBLEM_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Unresolved String</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = PROBLEM_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>String Resolution Problem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM_FEATURE_COUNT = PROBLEM_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___GET_EANNOTATION__STRING = PROBLEM___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = PROBLEM___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___GET_STYLE__ECLASS = PROBLEM___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___CREATE_STYLE__ECLASS = PROBLEM___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>String Resolution Problem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM_OPERATION_COUNT = PROBLEM_OPERATION_COUNT + 0;
+
+	/**
+	 * 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
+	 */
+	EClass getProblem();
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EAttribute getStringResolutionProblem_UnresolvedString();
+
+	/**
+	 * 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
+	 */
+	NattableproblemFactory getNattableproblemFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass STRING_RESOLUTION_PROBLEM = eINSTANCE.getStringResolutionProblem();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+	}
+} // NattableproblemPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java
index 865a57e60e0..2e989e292ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java
@@ -1,32 +1,32 @@
-/**

- * 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.nattableproblem;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Problem</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * A problem

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getProblem()

- * @model

- * @generated

- */

-public interface Problem extends TableNamedElement {

-} // Problem

+/**
+ * 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.nattableproblem;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Problem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A problem
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getProblem()
+ * @model
+ * @generated
+ */
+public interface Problem extends TableNamedElement {
+} // Problem
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 99215607bdb..ffea51e50d7 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
@@ -1,79 +1,79 @@
-/**

- * 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.nattableproblem;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String Resolution Problem</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This kind of problem is used when the user set a value as a text in a Cell and the system can't convert this string value into the correct type

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem()

- * @model

- * @generated

- */

-public interface StringResolutionProblem extends Problem {

-

-	/**

-	 * Returns the value of the '<em><b>Value As String</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getValueAsString();

-

-	/**

-	 * 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.

-	 * @see #getValueAsString()

-	 * @generated

-	 */

-	void setValueAsString(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unresolved String</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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"

-	 * @generated

-	 */

-	EList<String> getUnresolvedString();

-} // StringResolutionProblem

+/**
+ * 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.nattableproblem;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Resolution Problem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This kind of problem is used when the user set a value as a text in a Cell and the system can't convert this string value into the correct type
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem()
+ * @model
+ * @generated
+ */
+public interface StringResolutionProblem extends Problem {
+
+	/**
+	 * Returns the value of the '<em><b>Value As String</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getValueAsString();
+
+	/**
+	 * 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.
+	 * @see #getValueAsString()
+	 * @generated
+	 */
+	void setValueAsString(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Unresolved String</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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"
+	 * @generated
+	 */
+	EList<String> getUnresolvedString();
+} // StringResolutionProblem
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 da0ab358907..2fecfeb0103 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
@@ -1,119 +1,119 @@
-/**

- * 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.nattableproblem.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemFactoryImpl extends EFactoryImpl implements NattableproblemFactory {

-

-	/**

-	 * 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) {

-				return theNattableproblemFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableproblemFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Problem createProblem() {

-		ProblemImpl problem = new ProblemImpl();

-		return problem;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public StringResolutionProblem createStringResolutionProblem() {

-		StringResolutionProblemImpl stringResolutionProblem = new StringResolutionProblemImpl();

-		return stringResolutionProblem;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableproblemPackage getNattableproblemPackage() {

-		return (NattableproblemPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableproblemPackage getPackage() {

-		return NattableproblemPackage.eINSTANCE;

-	}

-} // NattableproblemFactoryImpl

+/**
+ * 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.nattableproblem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemFactoryImpl extends EFactoryImpl implements NattableproblemFactory {
+
+	/**
+	 * 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) {
+				return theNattableproblemFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableproblemFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- 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$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Problem createProblem() {
+		ProblemImpl problem = new ProblemImpl();
+		return problem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public StringResolutionProblem createStringResolutionProblem() {
+		StringResolutionProblemImpl stringResolutionProblem = new StringResolutionProblemImpl();
+		return stringResolutionProblem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableproblemPackage getNattableproblemPackage() {
+		return (NattableproblemPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableproblemPackage getPackage() {
+		return NattableproblemPackage.eINSTANCE;
+	}
+} // NattableproblemFactoryImpl
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 1002a2697d7..f69a52d1551 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
@@ -1,287 +1,287 @@
-/**

- * 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.nattableproblem.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemPackageImpl extends EPackageImpl implements NattableproblemPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass problemEClass = null;

-

-	/**

-	 * <!-- 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

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableproblemPackageImpl() {

-		super(eNS_URI, NattableproblemFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link 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);

-

-		// 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();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		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);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableproblemPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableproblemPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.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;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getProblem() {

-		return problemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStringResolutionProblem() {

-		return stringResolutionProblemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringResolutionProblem_ValueAsString() {

-		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringResolutionProblem_UnresolvedString() {

-		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableproblemFactory getNattableproblemFactory() {

-		return (NattableproblemFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		problemEClass = createEClass(PROBLEM);

-

-		stringResolutionProblemEClass = createEClass(STRING_RESOLUTION_PROBLEM);

-		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING);

-		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-

-		// 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$

-	}

-} // NattableproblemPackageImpl

+/**
+ * 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.nattableproblem.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemPackageImpl extends EPackageImpl implements NattableproblemPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass problemEClass = null;
+
+	/**
+	 * <!-- 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
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableproblemPackageImpl() {
+		super(eNS_URI, NattableproblemFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link 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);
+
+		// 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();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		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);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableproblemPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableproblemPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.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;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getProblem() {
+		return problemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStringResolutionProblem() {
+		return stringResolutionProblemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringResolutionProblem_ValueAsString() {
+		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringResolutionProblem_UnresolvedString() {
+		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableproblemFactory getNattableproblemFactory() {
+		return (NattableproblemFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		problemEClass = createEClass(PROBLEM);
+
+		stringResolutionProblemEClass = createEClass(STRING_RESOLUTION_PROBLEM);
+		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING);
+		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+
+		// 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$
+	}
+} // NattableproblemPackageImpl
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 b797082ef05..2f744fd6733 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
@@ -1,47 +1,47 @@
-/**

- * 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.nattableproblem.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-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 -->

- *

- * @generated

- */

-public class ProblemImpl extends TableNamedElementImpl implements Problem {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ProblemImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableproblemPackage.Literals.PROBLEM;

-	}

-} // ProblemImpl

+/**
+ * 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.nattableproblem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+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 -->
+ *
+ * @generated
+ */
+public class ProblemImpl extends TableNamedElementImpl implements Problem {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ProblemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableproblemPackage.Literals.PROBLEM;
+	}
+} // ProblemImpl
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 5d65b7406e5..fb6a0b30232 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
@@ -1,213 +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.nattableproblem.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String Resolution Problem</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class StringResolutionProblemImpl extends ProblemImpl implements StringResolutionProblem {

-

-	/**

-	 * The default value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getValueAsString()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_AS_STRING_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getValueAsString()

-	 * @generated

-	 * @ordered

-	 */

-	protected String valueAsString = VALUE_AS_STRING_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getUnresolvedString() <em>Unresolved String</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getUnresolvedString()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> unresolvedString;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringResolutionProblemImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getValueAsString() {

-		return valueAsString;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setValueAsString(String newValueAsString) {

-		String oldValueAsString = valueAsString;

-		valueAsString = newValueAsString;

-		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) {

-			unresolvedString = new EDataTypeUniqueEList<String>(String.class, this, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);

-		}

-		return unresolvedString;

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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 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);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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(" (valueAsString: "); //$NON-NLS-1$

-		result.append(valueAsString);

-		result.append(", unresolvedString: "); //$NON-NLS-1$

-		result.append(unresolvedString);

-		result.append(')');

-		return result.toString();

-	}

-} // StringResolutionProblemImpl

+/**
+ * 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.nattableproblem.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String Resolution Problem</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringResolutionProblemImpl extends ProblemImpl implements StringResolutionProblem {
+
+	/**
+	 * The default value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValueAsString()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_AS_STRING_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValueAsString()
+	 * @generated
+	 * @ordered
+	 */
+	protected String valueAsString = VALUE_AS_STRING_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getUnresolvedString() <em>Unresolved String</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUnresolvedString()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> unresolvedString;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringResolutionProblemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getValueAsString() {
+		return valueAsString;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValueAsString(String newValueAsString) {
+		String oldValueAsString = valueAsString;
+		valueAsString = newValueAsString;
+		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) {
+			unresolvedString = new EDataTypeUniqueEList<String>(String.class, this, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);
+		}
+		return unresolvedString;
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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 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);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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(" (valueAsString: "); //$NON-NLS-1$
+		result.append(valueAsString);
+		result.append(", unresolvedString: "); //$NON-NLS-1$
+		result.append(unresolvedString);
+		result.append(')');
+		return result.toString();
+	}
+} // StringResolutionProblemImpl
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 2283d95892f..3d2f4888e77 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
@@ -1,202 +1,202 @@
-/**

- * 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.nattableproblem.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

- * @generated

- */

-public class NattableproblemAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableproblemPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableproblemPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected 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();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public Adapter createProblemAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createStringResolutionProblemAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableproblemAdapterFactory

+/**
+ * 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.nattableproblem.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage
+ * @generated
+ */
+public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableproblemPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableproblemPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected 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();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+	 */
+	public Adapter createProblemAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createStringResolutionProblemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableproblemAdapterFactory
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 26813193fb2..216e3ab4bfd 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
@@ -1,195 +1,195 @@
-/**

- * 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.nattableproblem.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

- * @generated

- */

-public class NattableproblemSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableproblemPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableproblemPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case 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);

-				if (result == null) result = caseEModelElement(stringResolutionProblem);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Problem</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>Problem</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseProblem(Problem object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String Resolution Problem</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>String Resolution Problem</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringResolutionProblem(StringResolutionProblem object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableproblemSwitch

+/**
+ * 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.nattableproblem.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage
+ * @generated
+ */
+public class NattableproblemSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableproblemPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableproblemPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case 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);
+				if (result == null) result = caseEModelElement(stringResolutionProblem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Problem</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>Problem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseProblem(Problem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String Resolution Problem</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>String Resolution Problem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringResolutionProblem(StringResolutionProblem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableproblemSwitch
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 1b64efe5a22..3cf62be0855 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
@@ -1,53 +1,53 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Boolean List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Boolean lists representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle()

- * @model

- * @generated

- */

-public interface BooleanListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Boolean List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.Boolean}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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"

-	 * @generated

-	 */

-	EList<Boolean> getBooleanListValue();

-} // BooleanListValueStyle

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Boolean List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Boolean lists representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle()
+ * @model
+ * @generated
+ */
+public interface BooleanListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Boolean List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.Boolean}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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"
+	 * @generated
+	 */
+	EList<Boolean> getBooleanListValue();
+} // BooleanListValueStyle
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 6da6fccda7c..c97b9ced767 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
@@ -1,61 +1,61 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Boolean Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Boolean representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle()

- * @model

- * @generated

- */

-public interface BooleanValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Boolean Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model

-	 * @generated

-	 */

-	boolean isBooleanValue();

-

-	/**

-	 * 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.

-	 * @see #isBooleanValue()

-	 * @generated

-	 */

-	void setBooleanValue(boolean value);

-} // BooleanValueStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Boolean Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Boolean representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle()
+ * @model
+ * @generated
+ */
+public interface BooleanValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Boolean Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model
+	 * @generated
+	 */
+	boolean isBooleanValue();
+
+	/**
+	 * 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.
+	 * @see #isBooleanValue()
+	 * @generated
+	 */
+	void setBooleanValue(boolean value);
+} // BooleanValueStyle
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 0f07070ed81..e73f7788ce6 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
@@ -1,400 +1,400 @@
-/**

- * 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.nattablestyle;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Cell Text Alignment</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * <!-- 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

- */

-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

-	 */

-	TOP_LEFT(1, "TOP_LEFT", "TOP_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>TOP CENTER</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #TOP_CENTER_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	TOP_CENTER(2, "TOP_CENTER", "TOP_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>TOP RIGHT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #TOP_RIGHT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	TOP_RIGHT(3, "TOP_RIGHT", "TOP_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>MIDDLE LEFT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_LEFT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MIDDLE_LEFT(4, "MIDDLE_LEFT", "MIDDLE_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>MIDDLE CENTER</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_CENTER_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MIDDLE_CENTER(5, "MIDDLE_CENTER", "MIDDLE_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>MIDDLE RIGHT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_RIGHT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MIDDLE_RIGHT(6, "MIDDLE_RIGHT", "MIDDLE_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>BOTTOM LEFT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_LEFT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	BOTTOM_LEFT(7, "BOTTOM_LEFT", "BOTTOM_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>BOTTOM CENTER</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_CENTER_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	BOTTOM_CENTER(8, "BOTTOM_CENTER", "BOTTOM_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>BOTTOM RIGHT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_RIGHT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	BOTTOM_RIGHT(9, "BOTTOM_RIGHT", "BOTTOM_RIGHT"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>TOP LEFT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int TOP_LEFT_VALUE = 1;

-

-	/**

-	 * The '<em><b>TOP CENTER</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int TOP_CENTER_VALUE = 2;

-

-	/**

-	 * The '<em><b>TOP RIGHT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int TOP_RIGHT_VALUE = 3;

-

-	/**

-	 * The '<em><b>MIDDLE LEFT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int MIDDLE_LEFT_VALUE = 4;

-

-	/**

-	 * The '<em><b>MIDDLE CENTER</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int MIDDLE_CENTER_VALUE = 5;

-

-	/**

-	 * The '<em><b>MIDDLE RIGHT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int MIDDLE_RIGHT_VALUE = 6;

-

-	/**

-	 * The '<em><b>BOTTOM LEFT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int BOTTOM_LEFT_VALUE = 7;

-

-	/**

-	 * The '<em><b>BOTTOM CENTER</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int BOTTOM_CENTER_VALUE = 8;

-

-	/**

-	 * The '<em><b>BOTTOM RIGHT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int BOTTOM_RIGHT_VALUE = 9;

-

-	/**

-	 * 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,

-		};

-

-	/**

-	 * 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));

-

-	/**

-	 * 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) {

-			CellTextAlignment result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 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) {

-			CellTextAlignment result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 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;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private CellTextAlignment(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // CellTextAlignment

+/**
+ * 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.nattablestyle;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Cell Text Alignment</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- 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
+ */
+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
+	 */
+	TOP_LEFT(1, "TOP_LEFT", "TOP_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>TOP CENTER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TOP_CENTER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	TOP_CENTER(2, "TOP_CENTER", "TOP_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>TOP RIGHT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TOP_RIGHT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	TOP_RIGHT(3, "TOP_RIGHT", "TOP_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>MIDDLE LEFT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_LEFT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MIDDLE_LEFT(4, "MIDDLE_LEFT", "MIDDLE_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>MIDDLE CENTER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_CENTER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MIDDLE_CENTER(5, "MIDDLE_CENTER", "MIDDLE_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>MIDDLE RIGHT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_RIGHT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MIDDLE_RIGHT(6, "MIDDLE_RIGHT", "MIDDLE_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>BOTTOM LEFT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_LEFT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BOTTOM_LEFT(7, "BOTTOM_LEFT", "BOTTOM_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>BOTTOM CENTER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_CENTER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BOTTOM_CENTER(8, "BOTTOM_CENTER", "BOTTOM_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>BOTTOM RIGHT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_RIGHT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BOTTOM_RIGHT(9, "BOTTOM_RIGHT", "BOTTOM_RIGHT"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>TOP LEFT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int TOP_LEFT_VALUE = 1;
+
+	/**
+	 * The '<em><b>TOP CENTER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int TOP_CENTER_VALUE = 2;
+
+	/**
+	 * The '<em><b>TOP RIGHT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int TOP_RIGHT_VALUE = 3;
+
+	/**
+	 * The '<em><b>MIDDLE LEFT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int MIDDLE_LEFT_VALUE = 4;
+
+	/**
+	 * The '<em><b>MIDDLE CENTER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int MIDDLE_CENTER_VALUE = 5;
+
+	/**
+	 * The '<em><b>MIDDLE RIGHT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int MIDDLE_RIGHT_VALUE = 6;
+
+	/**
+	 * The '<em><b>BOTTOM LEFT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int BOTTOM_LEFT_VALUE = 7;
+
+	/**
+	 * The '<em><b>BOTTOM CENTER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int BOTTOM_CENTER_VALUE = 8;
+
+	/**
+	 * The '<em><b>BOTTOM RIGHT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int BOTTOM_RIGHT_VALUE = 9;
+
+	/**
+	 * 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,
+		};
+
+	/**
+	 * 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));
+
+	/**
+	 * 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) {
+			CellTextAlignment result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 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) {
+			CellTextAlignment result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 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;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private CellTextAlignment(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // CellTextAlignment
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 0693f1a7dfe..ebb5749d4a7 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
@@ -1,65 +1,65 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Cell Text Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Text representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle()

- * @model

- * @generated

- */

-public interface CellTextStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Alignment</b></em>' attribute.

-	 * The default value is <code>"MIDDLE_LEFT"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle_Alignment()

-	 * @model default="MIDDLE_LEFT"

-	 * @generated

-	 */

-	CellTextAlignment getAlignment();

-

-	/**

-	 * 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.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-	 * @see #getAlignment()

-	 * @generated

-	 */

-	void setAlignment(CellTextAlignment value);

-} // CellTextStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cell Text Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Text representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle()
+ * @model
+ * @generated
+ */
+public interface CellTextStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Alignment</b></em>' attribute.
+	 * The default value is <code>"MIDDLE_LEFT"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle_Alignment()
+	 * @model default="MIDDLE_LEFT"
+	 * @generated
+	 */
+	CellTextAlignment getAlignment();
+
+	/**
+	 * 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.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+	 * @see #getAlignment()
+	 * @generated
+	 */
+	void setAlignment(CellTextAlignment value);
+} // CellTextStyle
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 f42917c92ad..605eba91987 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
@@ -1,249 +1,249 @@
-/**

- * 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.nattablestyle;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>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

- */

-public enum DisplayStyle implements Enumerator {

-	/**

-	 * The '<em><b>NORMAL</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #NORMAL_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	NORMAL(0, "NORMAL", "NORMAL"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * 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

-	 */

-	HIERARCHIC_SINGLE_TREE_COLUMN(1, "HIERARCHIC_SINGLE_TREE_COLUMN", "HIERARCHIC_SINGLE_TREE_COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * 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

-	 */

-	HIERARCHIC_MULTI_TREE_COLUMN(2, "HIERARCHIC_MULTI_TREE_COLUMN", "HIERARCHIC_MULTI_TREE_COLUMN"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>NORMAL</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int NORMAL_VALUE = 0;

-

-	/**

-	 * The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int HIERARCHIC_SINGLE_TREE_COLUMN_VALUE = 1;

-

-	/**

-	 * The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #HIERARCHIC_MULTI_TREE_COLUMN

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int HIERARCHIC_MULTI_TREE_COLUMN_VALUE = 2;

-

-	/**

-	 * 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,

-		};

-

-	/**

-	 * 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));

-

-	/**

-	 * 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) {

-			DisplayStyle result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 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) {

-			DisplayStyle result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 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;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private DisplayStyle(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // DisplayStyle

+/**
+ * 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.nattablestyle;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>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
+ */
+public enum DisplayStyle implements Enumerator {
+	/**
+	 * The '<em><b>NORMAL</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NORMAL_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NORMAL(0, "NORMAL", "NORMAL"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * 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
+	 */
+	HIERARCHIC_SINGLE_TREE_COLUMN(1, "HIERARCHIC_SINGLE_TREE_COLUMN", "HIERARCHIC_SINGLE_TREE_COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * 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
+	 */
+	HIERARCHIC_MULTI_TREE_COLUMN(2, "HIERARCHIC_MULTI_TREE_COLUMN", "HIERARCHIC_MULTI_TREE_COLUMN"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>NORMAL</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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
+	 * @ordered
+	 */
+	public static final int NORMAL_VALUE = 0;
+
+	/**
+	 * The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int HIERARCHIC_SINGLE_TREE_COLUMN_VALUE = 1;
+
+	/**
+	 * The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #HIERARCHIC_MULTI_TREE_COLUMN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int HIERARCHIC_MULTI_TREE_COLUMN_VALUE = 2;
+
+	/**
+	 * 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,
+		};
+
+	/**
+	 * 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));
+
+	/**
+	 * 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) {
+			DisplayStyle result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 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) {
+			DisplayStyle result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 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;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private DisplayStyle(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // DisplayStyle
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 5d3f7cfde56..86208ca4aa1 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
@@ -1,53 +1,53 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Double List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Double lists representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle()

- * @model

- * @generated

- */

-public interface DoubleListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Double List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.Double}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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"

-	 * @generated

-	 */

-	EList<Double> getDoubleListValue();

-} // DoubleListValueStyle

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Double List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Double lists representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle()
+ * @model
+ * @generated
+ */
+public interface DoubleListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Double List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.Double}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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"
+	 * @generated
+	 */
+	EList<Double> getDoubleListValue();
+} // DoubleListValueStyle
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 eb876d3cd9e..25d58469fe0 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
@@ -1,61 +1,61 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Double Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Double representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle()

- * @model

- * @generated

- */

-public interface DoubleValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Double Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model

-	 * @generated

-	 */

-	double getDoubleValue();

-

-	/**

-	 * 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.

-	 * @see #getDoubleValue()

-	 * @generated

-	 */

-	void setDoubleValue(double value);

-} // DoubleValueStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Double Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Double representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle()
+ * @model
+ * @generated
+ */
+public interface DoubleValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Double Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model
+	 * @generated
+	 */
+	double getDoubleValue();
+
+	/**
+	 * 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.
+	 * @see #getDoubleValue()
+	 * @generated
+	 */
+	void setDoubleValue(double value);
+} // DoubleValueStyle
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 03d72cd5e0d..49a3a5728ba 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
@@ -1,224 +1,224 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Font Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Font style of the cell's text

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle()

- * @model

- * @generated

- */

-public interface FontStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Font Color</b></em>' attribute.

-	 * The default value is <code>"0"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="0"

-	 * @generated

-	 */

-	int getFontColor();

-

-	/**

-	 * 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.

-	 * @see #getFontColor()

-	 * @generated

-	 */

-	void setFontColor(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Font Name</b></em>' attribute.

-	 * The default value is <code>"Tahoma"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="Tahoma"

-	 * @generated

-	 */

-	String getFontName();

-

-	/**

-	 * 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.

-	 * @see #getFontName()

-	 * @generated

-	 */

-	void setFontName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Font Height</b></em>' attribute.

-	 * The default value is <code>"9"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="9"

-	 * @generated

-	 */

-	int getFontHeight();

-

-	/**

-	 * 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.

-	 * @see #getFontHeight()

-	 * @generated

-	 */

-	void setFontHeight(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Bold</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isBold();

-

-	/**

-	 * 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.

-	 * @see #isBold()

-	 * @generated

-	 */

-	void setBold(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Italic</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isItalic();

-

-	/**

-	 * 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.

-	 * @see #isItalic()

-	 * @generated

-	 */

-	void setItalic(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Underline</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isUnderline();

-

-	/**

-	 * 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.

-	 * @see #isUnderline()

-	 * @generated

-	 */

-	void setUnderline(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Strike Through</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isStrikeThrough();

-

-	/**

-	 * 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.

-	 * @see #isStrikeThrough()

-	 * @generated

-	 */

-	void setStrikeThrough(boolean value);

-} // FontStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Font Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Font style of the cell's text
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle()
+ * @model
+ * @generated
+ */
+public interface FontStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Font Color</b></em>' attribute.
+	 * The default value is <code>"0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="0"
+	 * @generated
+	 */
+	int getFontColor();
+
+	/**
+	 * 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.
+	 * @see #getFontColor()
+	 * @generated
+	 */
+	void setFontColor(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Font Name</b></em>' attribute.
+	 * The default value is <code>"Tahoma"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="Tahoma"
+	 * @generated
+	 */
+	String getFontName();
+
+	/**
+	 * 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.
+	 * @see #getFontName()
+	 * @generated
+	 */
+	void setFontName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Font Height</b></em>' attribute.
+	 * The default value is <code>"9"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="9"
+	 * @generated
+	 */
+	int getFontHeight();
+
+	/**
+	 * 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.
+	 * @see #getFontHeight()
+	 * @generated
+	 */
+	void setFontHeight(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Bold</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isBold();
+
+	/**
+	 * 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.
+	 * @see #isBold()
+	 * @generated
+	 */
+	void setBold(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Italic</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isItalic();
+
+	/**
+	 * 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.
+	 * @see #isItalic()
+	 * @generated
+	 */
+	void setItalic(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Underline</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isUnderline();
+
+	/**
+	 * 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.
+	 * @see #isUnderline()
+	 * @generated
+	 */
+	void setUnderline(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Strike Through</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isStrikeThrough();
+
+	/**
+	 * 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.
+	 * @see #isStrikeThrough()
+	 * @generated
+	 */
+	void setStrikeThrough(boolean value);
+} // FontStyle
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 ac176e848ad..3346c613664 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
@@ -1,53 +1,53 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Int List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Int lists representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle()

- * @model

- * @generated

- */

-public interface IntListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Int List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.Integer}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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"

-	 * @generated

-	 */

-	EList<Integer> getIntListValue();

-} // IntListValueStyle

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Int List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Int lists representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle()
+ * @model
+ * @generated
+ */
+public interface IntListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Int List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.Integer}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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"
+	 * @generated
+	 */
+	EList<Integer> getIntListValue();
+} // IntListValueStyle
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 de92fb7f634..7df8dcd5819 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
@@ -1,61 +1,61 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Int Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Int representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle()

- * @model

- * @generated

- */

-public interface IntValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Int Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model

-	 * @generated

-	 */

-	int getIntValue();

-

-	/**

-	 * 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.

-	 * @see #getIntValue()

-	 * @generated

-	 */

-	void setIntValue(int value);

-} // IntValueStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Int Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Int representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle()
+ * @model
+ * @generated
+ */
+public interface IntValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Int Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model
+	 * @generated
+	 */
+	int getIntValue();
+
+	/**
+	 * 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.
+	 * @see #getIntValue()
+	 * @generated
+	 */
+	void setIntValue(int value);
+} // IntValueStyle
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 e2fc1fa0707..b79f876f668 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
@@ -1,61 +1,61 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Named Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * used to represent character and paragraph styles

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle()

- * @model

- * @generated

- */

-public interface NamedStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * 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.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-} // NamedStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Named Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * used to represent character and paragraph styles
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle()
+ * @model
+ * @generated
+ */
+public interface NamedStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * 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.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+} // NamedStyle
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 0aa8ddcf2c7..4f984acbd42 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
@@ -1,169 +1,169 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

- * @generated

- */

-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();

-

-	/**

-	 * 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

-	 */

-	NamedStyle createNamedStyle();

-

-	/**

-	 * 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

-	 */

-	FontStyle createFontStyle();

-

-	/**

-	 * 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

-	 */

-	CellTextStyle createCellTextStyle();

-

-	/**

-	 * 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

-	 */

-	IntValueStyle createIntValueStyle();

-

-	/**

-	 * 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

-	 */

-	IntListValueStyle createIntListValueStyle();

-

-	/**

-	 * 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

-	 */

-	BooleanValueStyle createBooleanValueStyle();

-

-	/**

-	 * 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

-	 */

-	BooleanListValueStyle createBooleanListValueStyle();

-

-	/**

-	 * 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

-	 */

-	DoubleValueStyle createDoubleValueStyle();

-

-	/**

-	 * 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

-	 */

-	DoubleListValueStyle createDoubleListValueStyle();

-

-	/**

-	 * 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

-	 */

-	StringValueStyle createStringValueStyle();

-

-	/**

-	 * 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

-	 */

-	StringListValueStyle createStringListValueStyle();

-

-	/**

-	 * 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

-	 */

-	TableDisplayStyle createTableDisplayStyle();

-

-	/**

-	 * 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

-	 */

-	EObjectValueStyle createEObjectValueStyle();

-

-	/**

-	 * 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

-	 */

-	EObjectListValueStyle createEObjectListValueStyle();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattablestylePackage getNattablestylePackage();

-} // NattablestyleFactory

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage
+ * @generated
+ */
+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();
+
+	/**
+	 * 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
+	 */
+	NamedStyle createNamedStyle();
+
+	/**
+	 * 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
+	 */
+	FontStyle createFontStyle();
+
+	/**
+	 * 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
+	 */
+	CellTextStyle createCellTextStyle();
+
+	/**
+	 * 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
+	 */
+	IntValueStyle createIntValueStyle();
+
+	/**
+	 * 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
+	 */
+	IntListValueStyle createIntListValueStyle();
+
+	/**
+	 * 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
+	 */
+	BooleanValueStyle createBooleanValueStyle();
+
+	/**
+	 * 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
+	 */
+	BooleanListValueStyle createBooleanListValueStyle();
+
+	/**
+	 * 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
+	 */
+	DoubleValueStyle createDoubleValueStyle();
+
+	/**
+	 * 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
+	 */
+	DoubleListValueStyle createDoubleListValueStyle();
+
+	/**
+	 * 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
+	 */
+	StringValueStyle createStringValueStyle();
+
+	/**
+	 * 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
+	 */
+	StringListValueStyle createStringListValueStyle();
+
+	/**
+	 * 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
+	 */
+	TableDisplayStyle createTableDisplayStyle();
+
+	/**
+	 * 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
+	 */
+	EObjectValueStyle createEObjectValueStyle();
+
+	/**
+	 * 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
+	 */
+	EObjectListValueStyle createEObjectListValueStyle();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattablestylePackage getNattablestylePackage();
+} // NattablestyleFactory
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 eac0e52f011..fce0e5a42ae 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
@@ -1,1972 +1,1972 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory

- * @model kind="package"

- * @generated

- */

-public interface NattablestylePackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattablestyle"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattablestyle"; //$NON-NLS-1$

-

-	/**

-	 * 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();

-

-	/**

-	 * 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

-	 */

-	int STYLE = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLE__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The number of structural features of the '<em>Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLE_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLE___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int NAMED_STYLE = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE__NAME = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Named Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int FONT_STYLE = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Font Color</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__FONT_COLOR = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Font Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__FONT_NAME = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Font Height</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__FONT_HEIGHT = STYLE_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Bold</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__BOLD = STYLE_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Italic</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__ITALIC = STYLE_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Underline</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__UNDERLINE = STYLE_FEATURE_COUNT + 5;

-

-	/**

-	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__STRIKE_THROUGH = STYLE_FEATURE_COUNT + 6;

-

-	/**

-	 * The number of structural features of the '<em>Font Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 7;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int CELL_TEXT_STYLE = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Alignment</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE__ALIGNMENT = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Cell Text Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int INT_VALUE_STYLE = 4;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Int Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE__INT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Int Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int INT_LIST_VALUE_STYLE = 5;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Int List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE__INT_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Int List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int BOOLEAN_VALUE_STYLE = 6;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Boolean Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE = 7;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Boolean List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Boolean List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int DOUBLE_VALUE_STYLE = 8;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Double Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE__DOUBLE_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Double Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int DOUBLE_LIST_VALUE_STYLE = 9;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Double List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Double List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int STRING_VALUE_STYLE = 10;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>String Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE__STRING_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>String Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int STRING_LIST_VALUE_STYLE = 11;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>String List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>String List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int STYLED_ELEMENT = 12;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT__STYLES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Styled Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___GET_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___CREATE_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 2;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int TABLE_DISPLAY_STYLE = 13;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Display Style</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE__DISPLAY_STYLE = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Table Display Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int EOBJECT_VALUE_STYLE = 14;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>EObject Value</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int EOBJECT_LIST_VALUE_STYLE = 15;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>EObject Value</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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.

-	 * <!-- 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

-	 */

-	int CELL_TEXT_ALIGNMENT = 16;

-

-	/**

-	 * 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

-	 */

-	int DISPLAY_STYLE = 17;

-

-	/**

-	 * 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

-	 */

-	EClass getStyle();

-

-	/**

-	 * 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

-	 */

-	EClass getNamedStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getNamedStyle_Name();

-

-	/**

-	 * 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

-	 */

-	EClass getFontStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EAttribute getFontStyle_FontHeight();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getFontStyle_Bold();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getFontStyle_Italic();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EAttribute getFontStyle_StrikeThrough();

-

-	/**

-	 * 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

-	 */

-	EClass getCellTextStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getCellTextStyle_Alignment();

-

-	/**

-	 * 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

-	 */

-	EClass getIntValueStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EAttribute getIntListValueStyle_IntListValue();

-

-	/**

-	 * 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

-	 */

-	EClass getBooleanValueStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EAttribute getBooleanListValueStyle_BooleanListValue();

-

-	/**

-	 * 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

-	 */

-	EClass getDoubleValueStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EAttribute getDoubleListValueStyle_DoubleListValue();

-

-	/**

-	 * 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

-	 */

-	EClass getStringValueStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EAttribute getStringListValueStyle_StringListValue();

-

-	/**

-	 * 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	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.

-	 * <!-- 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)

-	 * @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.

-	 * <!-- 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

-	 */

-	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.

-	 * <!-- 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

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	EClass getTableDisplayStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	EAttribute getTableDisplayStyle_DisplayStyle();

-

-	/**

-	 * 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

-	 */

-	EClass getEObjectValueStyle();

-

-	/**

-	 * 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()

-	 * @generated

-	 */

-	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>}'.

-	 * <!-- 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

-	 */

-	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>}'.

-	 * <!-- 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()

-	 * @generated

-	 */

-	EReference getEObjectListValueStyle_EObjectValue();

-

-	/**

-	 * 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

-	 */

-	EEnum getCellTextAlignment();

-

-	/**

-	 * 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

-	 */

-	EEnum getDisplayStyle();

-

-	/**

-	 * 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

-	 */

-	NattablestyleFactory getNattablestyleFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EClass NAMED_STYLE = eINSTANCE.getNamedStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass FONT_STYLE = eINSTANCE.getFontStyle();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass CELL_TEXT_STYLE = eINSTANCE.getCellTextStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass INT_VALUE_STYLE = eINSTANCE.getIntValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass INT_LIST_VALUE_STYLE = eINSTANCE.getIntListValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass BOOLEAN_VALUE_STYLE = eINSTANCE.getBooleanValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass BOOLEAN_LIST_VALUE_STYLE = eINSTANCE.getBooleanListValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass DOUBLE_VALUE_STYLE = eINSTANCE.getDoubleValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass DOUBLE_LIST_VALUE_STYLE = eINSTANCE.getDoubleListValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass STRING_VALUE_STYLE = eINSTANCE.getStringValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass STRING_LIST_VALUE_STYLE = eINSTANCE.getStringListValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass STYLED_ELEMENT = eINSTANCE.getStyledElement();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass TABLE_DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass EOBJECT_VALUE_STYLE = eINSTANCE.getEObjectValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		EClass EOBJECT_LIST_VALUE_STYLE = eINSTANCE.getEObjectListValueStyle();

-

-		/**

-		 * 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.

-		 * <!-- 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

-		 */

-		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.

-		 * <!-- 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

-		 */

-		EEnum DISPLAY_STYLE = eINSTANCE.getDisplayStyle();

-	}

-} // NattablestylePackage

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattablestylePackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattablestyle"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattablestyle"; //$NON-NLS-1$
+
+	/**
+	 * 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();
+
+	/**
+	 * 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
+	 */
+	int STYLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLE__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The number of structural features of the '<em>Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLE_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLE___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int NAMED_STYLE = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE__NAME = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Named Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int FONT_STYLE = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__FONT_COLOR = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__FONT_NAME = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__FONT_HEIGHT = STYLE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Bold</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__BOLD = STYLE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Italic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__ITALIC = STYLE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Underline</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__UNDERLINE = STYLE_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__STRIKE_THROUGH = STYLE_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the '<em>Font Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 7;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int CELL_TEXT_STYLE = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE__ALIGNMENT = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Cell Text Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int INT_VALUE_STYLE = 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Int Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE__INT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Int Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int INT_LIST_VALUE_STYLE = 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Int List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE__INT_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Int List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int BOOLEAN_VALUE_STYLE = 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Boolean Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE = 7;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Boolean List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Boolean List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int DOUBLE_VALUE_STYLE = 8;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Double Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE__DOUBLE_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Double Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int DOUBLE_LIST_VALUE_STYLE = 9;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Double List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Double List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int STRING_VALUE_STYLE = 10;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>String Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE__STRING_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>String Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int STRING_LIST_VALUE_STYLE = 11;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>String List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>String List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int STYLED_ELEMENT = 12;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT__STYLES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Styled Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___GET_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___CREATE_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 2;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int TABLE_DISPLAY_STYLE = 13;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Display Style</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE__DISPLAY_STYLE = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Table Display Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int EOBJECT_VALUE_STYLE = 14;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>EObject Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int EOBJECT_LIST_VALUE_STYLE = 15;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>EObject Value</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * 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.
+	 * <!-- 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
+	 */
+	int CELL_TEXT_ALIGNMENT = 16;
+
+	/**
+	 * 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
+	 */
+	int DISPLAY_STYLE = 17;
+
+	/**
+	 * 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
+	 */
+	EClass getStyle();
+
+	/**
+	 * 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
+	 */
+	EClass getNamedStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getNamedStyle_Name();
+
+	/**
+	 * 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
+	 */
+	EClass getFontStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EAttribute getFontStyle_FontHeight();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getFontStyle_Bold();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getFontStyle_Italic();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EAttribute getFontStyle_StrikeThrough();
+
+	/**
+	 * 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
+	 */
+	EClass getCellTextStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getCellTextStyle_Alignment();
+
+	/**
+	 * 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
+	 */
+	EClass getIntValueStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EAttribute getIntListValueStyle_IntListValue();
+
+	/**
+	 * 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
+	 */
+	EClass getBooleanValueStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EAttribute getBooleanListValueStyle_BooleanListValue();
+
+	/**
+	 * 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
+	 */
+	EClass getDoubleValueStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EAttribute getDoubleListValueStyle_DoubleListValue();
+
+	/**
+	 * 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
+	 */
+	EClass getStringValueStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EAttribute getStringListValueStyle_StringListValue();
+
+	/**
+	 * 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	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.
+	 * <!-- 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)
+	 * @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.
+	 * <!-- 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
+	 */
+	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.
+	 * <!-- 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
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	EClass getTableDisplayStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	EAttribute getTableDisplayStyle_DisplayStyle();
+
+	/**
+	 * 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
+	 */
+	EClass getEObjectValueStyle();
+
+	/**
+	 * 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()
+	 * @generated
+	 */
+	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>}'.
+	 * <!-- 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
+	 */
+	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>}'.
+	 * <!-- 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()
+	 * @generated
+	 */
+	EReference getEObjectListValueStyle_EObjectValue();
+
+	/**
+	 * 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
+	 */
+	EEnum getCellTextAlignment();
+
+	/**
+	 * 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
+	 */
+	EEnum getDisplayStyle();
+
+	/**
+	 * 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
+	 */
+	NattablestyleFactory getNattablestyleFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EClass NAMED_STYLE = eINSTANCE.getNamedStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass FONT_STYLE = eINSTANCE.getFontStyle();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass CELL_TEXT_STYLE = eINSTANCE.getCellTextStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass INT_VALUE_STYLE = eINSTANCE.getIntValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass INT_LIST_VALUE_STYLE = eINSTANCE.getIntListValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass BOOLEAN_VALUE_STYLE = eINSTANCE.getBooleanValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass BOOLEAN_LIST_VALUE_STYLE = eINSTANCE.getBooleanListValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass DOUBLE_VALUE_STYLE = eINSTANCE.getDoubleValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass DOUBLE_LIST_VALUE_STYLE = eINSTANCE.getDoubleListValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass STRING_VALUE_STYLE = eINSTANCE.getStringValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass STRING_LIST_VALUE_STYLE = eINSTANCE.getStringListValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass STYLED_ELEMENT = eINSTANCE.getStyledElement();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass TABLE_DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass EOBJECT_VALUE_STYLE = eINSTANCE.getEObjectValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		EClass EOBJECT_LIST_VALUE_STYLE = eINSTANCE.getEObjectListValueStyle();
+
+		/**
+		 * 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.
+		 * <!-- 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
+		 */
+		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.
+		 * <!-- 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
+		 */
+		EEnum DISPLAY_STYLE = eINSTANCE.getDisplayStyle();
+	}
+} // NattablestylePackage
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 dea874605a7..02290dbf167 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
@@ -1,53 +1,53 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * String lists representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle()

- * @model

- * @generated

- */

-public interface StringListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>String List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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"

-	 * @generated

-	 */

-	EList<String> getStringListValue();

-} // StringListValueStyle

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * String lists representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle()
+ * @model
+ * @generated
+ */
+public interface StringListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>String List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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"
+	 * @generated
+	 */
+	EList<String> getStringListValue();
+} // StringListValueStyle
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 0087f8403ca..87aadbaf10a 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
@@ -1,61 +1,61 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * String representation

- * <!-- end-model-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle()

- * @model

- * @generated

- */

-public interface StringValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>String Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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()

-	 * @model

-	 * @generated

-	 */

-	String getStringValue();

-

-	/**

-	 * 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.

-	 * @see #getStringValue()

-	 * @generated

-	 */

-	void setStringValue(String value);

-} // StringValueStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * String representation
+ * <!-- end-model-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle()
+ * @model
+ * @generated
+ */
+public interface StringValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>String Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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()
+	 * @model
+	 * @generated
+	 */
+	String getStringValue();
+
+	/**
+	 * 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.
+	 * @see #getStringValue()
+	 * @generated
+	 */
+	void setStringValue(String value);
+} // StringValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java
index bbb229e9d22..999279817a9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java
@@ -1,32 +1,32 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Style from which all substyles originate

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyle()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface Style extends EModelElement {

-} // Style

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.ecore.EModelElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Style from which all substyles originate
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyle()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface Style extends EModelElement {
+} // Style
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 0f77e23a50a..239703f7134 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
@@ -1,75 +1,75 @@
-/**

- * 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.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Styled Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement()

- * @model abstract="true"

- * @generated

- */

-public interface StyledElement extends EModelElement {

-

-	/**

-	 * Returns the value of the '<em><b>Styles</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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"

-	 * @generated

-	 */

-	EList<Style> getStyles();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model

-	 * @generated

-	 */

-	NamedStyle getNamedStyle(EClass eClass, String name);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model

-	 * @generated

-	 */

-	Style getStyle(EClass eClass);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model

-	 * @generated

-	 */

-	Style createStyle(EClass eClass);

-} // StyledElement

+/**
+ * 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.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EModelElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Styled Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface StyledElement extends EModelElement {
+
+	/**
+	 * Returns the value of the '<em><b>Styles</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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"
+	 * @generated
+	 */
+	EList<Style> getStyles();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	NamedStyle getNamedStyle(EClass eClass, String name);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	Style getStyle(EClass eClass);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	Style createStyle(EClass eClass);
+} // StyledElement
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 b89bc423695..81e237307ed 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
@@ -1,61 +1,61 @@
-/**

- * 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.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Display Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle()

- * @model

- * @generated

- */

-public interface TableDisplayStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Display Style</b></em>' attribute.

-	 * The default value is <code>"NORMAL"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle_DisplayStyle()

-	 * @model default="NORMAL" required="true"

-	 * @generated

-	 */

-	DisplayStyle getDisplayStyle();

-

-	/**

-	 * 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.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

-	 * @see #getDisplayStyle()

-	 * @generated

-	 */

-	void setDisplayStyle(DisplayStyle value);

-} // TableDisplayStyle

+/**
+ * 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.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Display Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle()
+ * @model
+ * @generated
+ */
+public interface TableDisplayStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Display Style</b></em>' attribute.
+	 * The default value is <code>"NORMAL"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * 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)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle_DisplayStyle()
+	 * @model default="NORMAL" required="true"
+	 * @generated
+	 */
+	DisplayStyle getDisplayStyle();
+
+	/**
+	 * 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.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
+	 * @see #getDisplayStyle()
+	 * @generated
+	 */
+	void setDisplayStyle(DisplayStyle value);
+} // TableDisplayStyle
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 d66d5c4a47a..4d4065a6cd4 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
@@ -1,155 +1,155 @@
-/**

- * 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.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Boolean List Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class BooleanListValueStyleImpl extends NamedStyleImpl implements BooleanListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getBooleanListValue() <em>Boolean List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getBooleanListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Boolean> booleanListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected BooleanListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Boolean> getBooleanListValue() {

-		if (booleanListValue == null) {

-			booleanListValue = new EDataTypeEList<Boolean>(Boolean.class, this, NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);

-		}

-		return booleanListValue;

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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 NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-				getBooleanListValue().clear();

-				getBooleanListValue().addAll((Collection<? extends Boolean>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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(" (booleanListValue: "); //$NON-NLS-1$

-		result.append(booleanListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // BooleanListValueStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Boolean List Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class BooleanListValueStyleImpl extends NamedStyleImpl implements BooleanListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getBooleanListValue() <em>Boolean List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBooleanListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Boolean> booleanListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Boolean> getBooleanListValue() {
+		if (booleanListValue == null) {
+			booleanListValue = new EDataTypeEList<Boolean>(Boolean.class, this, NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);
+		}
+		return booleanListValue;
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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 NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+				getBooleanListValue().clear();
+				getBooleanListValue().addAll((Collection<? extends Boolean>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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(" (booleanListValue: "); //$NON-NLS-1$
+		result.append(booleanListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // BooleanListValueStyleImpl
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 7d494edc6df..b62949548dd 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
@@ -1,171 +1,171 @@
-/**

- * 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.nattablestyle.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.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Boolean Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValueStyle {

-

-	/**

-	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBooleanValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean BOOLEAN_VALUE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBooleanValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean booleanValue = BOOLEAN_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected BooleanValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isBooleanValue() {

-		return booleanValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setBooleanValue(boolean newBooleanValue) {

-		boolean oldBooleanValue = booleanValue;

-		booleanValue = newBooleanValue;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (booleanValue: "); //$NON-NLS-1$

-		result.append(booleanValue);

-		result.append(')');

-		return result.toString();

-	}

-} // BooleanValueStyleImpl

+/**
+ * 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.nattablestyle.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.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Boolean Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValueStyle {
+
+	/**
+	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBooleanValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean BOOLEAN_VALUE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBooleanValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean booleanValue = BOOLEAN_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isBooleanValue() {
+		return booleanValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBooleanValue(boolean newBooleanValue) {
+		boolean oldBooleanValue = booleanValue;
+		booleanValue = newBooleanValue;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (booleanValue: "); //$NON-NLS-1$
+		result.append(booleanValue);
+		result.append(')');
+		return result.toString();
+	}
+} // BooleanValueStyleImpl
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 f25af383d1f..17dec52fc85 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
@@ -1,173 +1,173 @@
-/**

- * 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.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Cell Text Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyle {

-

-	/**

-	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlignment()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final CellTextAlignment ALIGNMENT_EDEFAULT = CellTextAlignment.MIDDLE_LEFT;

-

-	/**

-	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlignment()

-	 * @generated

-	 * @ordered

-	 */

-	protected CellTextAlignment alignment = ALIGNMENT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected CellTextStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.CELL_TEXT_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public CellTextAlignment getAlignment() {

-		return alignment;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlignment(CellTextAlignment newAlignment) {

-		CellTextAlignment oldAlignment = alignment;

-		alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (alignment: "); //$NON-NLS-1$

-		result.append(alignment);

-		result.append(')');

-		return result.toString();

-	}

-} // CellTextStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cell Text Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyle {
+
+	/**
+	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CellTextAlignment ALIGNMENT_EDEFAULT = CellTextAlignment.MIDDLE_LEFT;
+
+	/**
+	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected CellTextAlignment alignment = ALIGNMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CellTextStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.CELL_TEXT_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CellTextAlignment getAlignment() {
+		return alignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlignment(CellTextAlignment newAlignment) {
+		CellTextAlignment oldAlignment = alignment;
+		alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (alignment: "); //$NON-NLS-1$
+		result.append(alignment);
+		result.append(')');
+		return result.toString();
+	}
+} // CellTextStyleImpl
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 9ed88c986b4..6b8df7aada1 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
@@ -1,155 +1,155 @@
-/**

- * 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.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Double List Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getDoubleListValue() <em>Double List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDoubleListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Double> doubleListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DoubleListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Double> getDoubleListValue() {

-		if (doubleListValue == null) {

-			doubleListValue = new EDataTypeEList<Double>(Double.class, this, NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);

-		}

-		return doubleListValue;

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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 NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-				getDoubleListValue().clear();

-				getDoubleListValue().addAll((Collection<? extends Double>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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(" (doubleListValue: "); //$NON-NLS-1$

-		result.append(doubleListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // DoubleListValueStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Double List Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getDoubleListValue() <em>Double List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDoubleListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Double> doubleListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DoubleListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Double> getDoubleListValue() {
+		if (doubleListValue == null) {
+			doubleListValue = new EDataTypeEList<Double>(Double.class, this, NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);
+		}
+		return doubleListValue;
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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 NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+				getDoubleListValue().clear();
+				getDoubleListValue().addAll((Collection<? extends Double>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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(" (doubleListValue: "); //$NON-NLS-1$
+		result.append(doubleListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // DoubleListValueStyleImpl
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 2055cef1d88..09f5ed08086 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
@@ -1,171 +1,171 @@
-/**

- * 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.nattablestyle.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.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Double Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueStyle {

-

-	/**

-	 * The default value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDoubleValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final double DOUBLE_VALUE_EDEFAULT = 0.0;

-

-	/**

-	 * The cached value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDoubleValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected double doubleValue = DOUBLE_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DoubleValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.DOUBLE_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public double getDoubleValue() {

-		return doubleValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDoubleValue(double newDoubleValue) {

-		double oldDoubleValue = doubleValue;

-		doubleValue = newDoubleValue;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (doubleValue: "); //$NON-NLS-1$

-		result.append(doubleValue);

-		result.append(')');

-		return result.toString();

-	}

-} // DoubleValueStyleImpl

+/**
+ * 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.nattablestyle.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.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Double Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueStyle {
+
+	/**
+	 * The default value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDoubleValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DOUBLE_VALUE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDoubleValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected double doubleValue = DOUBLE_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DoubleValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.DOUBLE_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDoubleValue() {
+		return doubleValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDoubleValue(double newDoubleValue) {
+		double oldDoubleValue = doubleValue;
+		doubleValue = newDoubleValue;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (doubleValue: "); //$NON-NLS-1$
+		result.append(doubleValue);
+		result.append(')');
+		return result.toString();
+	}
+} // DoubleValueStyleImpl
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 0f88a81b6f3..48c6ff4dcca 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
@@ -1,508 +1,508 @@
-/**

- * 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.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Font Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected static final int FONT_COLOR_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontColor()

-	 * @generated

-	 * @ordered

-	 */

-	protected int fontColor = FONT_COLOR_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String FONT_NAME_EDEFAULT = "Tahoma"; //$NON-NLS-1$

-

-	/**

-	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String fontName = FONT_NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontHeight()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int FONT_HEIGHT_EDEFAULT = 9;

-

-	/**

-	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontHeight()

-	 * @generated

-	 * @ordered

-	 */

-	protected int fontHeight = FONT_HEIGHT_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBold()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean BOLD_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isBold() <em>Bold</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBold()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean bold = BOLD_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isItalic()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean ITALIC_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isItalic() <em>Italic</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isItalic()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean italic = ITALIC_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isUnderline()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean UNDERLINE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isUnderline() <em>Underline</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isUnderline()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean underline = UNDERLINE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isStrikeThrough()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean STRIKE_THROUGH_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isStrikeThrough()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean strikeThrough = STRIKE_THROUGH_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FontStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.FONT_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getFontColor() {

-		return fontColor;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFontColor(int newFontColor) {

-		int oldFontColor = fontColor;

-		fontColor = newFontColor;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_COLOR, oldFontColor, fontColor));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getFontName() {

-		return fontName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFontName(String newFontName) {

-		String oldFontName = fontName;

-		fontName = newFontName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_NAME, oldFontName, fontName));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getFontHeight() {

-		return fontHeight;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFontHeight(int newFontHeight) {

-		int oldFontHeight = fontHeight;

-		fontHeight = newFontHeight;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_HEIGHT, oldFontHeight, fontHeight));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isBold() {

-		return bold;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setBold(boolean newBold) {

-		boolean oldBold = bold;

-		bold = newBold;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__BOLD, oldBold, bold));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isItalic() {

-		return italic;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setItalic(boolean newItalic) {

-		boolean oldItalic = italic;

-		italic = newItalic;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__ITALIC, oldItalic, italic));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isUnderline() {

-		return underline;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setUnderline(boolean newUnderline) {

-		boolean oldUnderline = underline;

-		underline = newUnderline;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__UNDERLINE, oldUnderline, underline));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isStrikeThrough() {

-		return strikeThrough;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setStrikeThrough(boolean newStrikeThrough) {

-		boolean oldStrikeThrough = strikeThrough;

-		strikeThrough = newStrikeThrough;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (fontColor: "); //$NON-NLS-1$

-		result.append(fontColor);

-		result.append(", fontName: "); //$NON-NLS-1$

-		result.append(fontName);

-		result.append(", fontHeight: "); //$NON-NLS-1$

-		result.append(fontHeight);

-		result.append(", bold: "); //$NON-NLS-1$

-		result.append(bold);

-		result.append(", italic: "); //$NON-NLS-1$

-		result.append(italic);

-		result.append(", underline: "); //$NON-NLS-1$

-		result.append(underline);

-		result.append(", strikeThrough: "); //$NON-NLS-1$

-		result.append(strikeThrough);

-		result.append(')');

-		return result.toString();

-	}

-} // FontStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Font Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected static final int FONT_COLOR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontColor()
+	 * @generated
+	 * @ordered
+	 */
+	protected int fontColor = FONT_COLOR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FONT_NAME_EDEFAULT = "Tahoma"; //$NON-NLS-1$
+
+	/**
+	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fontName = FONT_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int FONT_HEIGHT_EDEFAULT = 9;
+
+	/**
+	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected int fontHeight = FONT_HEIGHT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBold()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean BOLD_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isBold() <em>Bold</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBold()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean bold = BOLD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isItalic()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ITALIC_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isItalic() <em>Italic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isItalic()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean italic = ITALIC_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUnderline()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean UNDERLINE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUnderline()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean underline = UNDERLINE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isStrikeThrough()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean STRIKE_THROUGH_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isStrikeThrough()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean strikeThrough = STRIKE_THROUGH_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FontStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.FONT_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getFontColor() {
+		return fontColor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFontColor(int newFontColor) {
+		int oldFontColor = fontColor;
+		fontColor = newFontColor;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_COLOR, oldFontColor, fontColor));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getFontName() {
+		return fontName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFontName(String newFontName) {
+		String oldFontName = fontName;
+		fontName = newFontName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_NAME, oldFontName, fontName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getFontHeight() {
+		return fontHeight;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFontHeight(int newFontHeight) {
+		int oldFontHeight = fontHeight;
+		fontHeight = newFontHeight;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_HEIGHT, oldFontHeight, fontHeight));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isBold() {
+		return bold;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBold(boolean newBold) {
+		boolean oldBold = bold;
+		bold = newBold;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__BOLD, oldBold, bold));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isItalic() {
+		return italic;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setItalic(boolean newItalic) {
+		boolean oldItalic = italic;
+		italic = newItalic;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__ITALIC, oldItalic, italic));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isUnderline() {
+		return underline;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setUnderline(boolean newUnderline) {
+		boolean oldUnderline = underline;
+		underline = newUnderline;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__UNDERLINE, oldUnderline, underline));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isStrikeThrough() {
+		return strikeThrough;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStrikeThrough(boolean newStrikeThrough) {
+		boolean oldStrikeThrough = strikeThrough;
+		strikeThrough = newStrikeThrough;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (fontColor: "); //$NON-NLS-1$
+		result.append(fontColor);
+		result.append(", fontName: "); //$NON-NLS-1$
+		result.append(fontName);
+		result.append(", fontHeight: "); //$NON-NLS-1$
+		result.append(fontHeight);
+		result.append(", bold: "); //$NON-NLS-1$
+		result.append(bold);
+		result.append(", italic: "); //$NON-NLS-1$
+		result.append(italic);
+		result.append(", underline: "); //$NON-NLS-1$
+		result.append(underline);
+		result.append(", strikeThrough: "); //$NON-NLS-1$
+		result.append(strikeThrough);
+		result.append(')');
+		return result.toString();
+	}
+} // FontStyleImpl
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 6751fc71073..10bb1811bcd 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
@@ -1,155 +1,155 @@
-/**

- * 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.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Int List Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIntListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Integer> intListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IntListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.INT_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Integer> getIntListValue() {

-		if (intListValue == null) {

-			intListValue = new EDataTypeEList<Integer>(Integer.class, this, NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);

-		}

-		return intListValue;

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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 NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-				getIntListValue().clear();

-				getIntListValue().addAll((Collection<? extends Integer>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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(" (intListValue: "); //$NON-NLS-1$

-		result.append(intListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // IntListValueStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int List Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIntListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Integer> intListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IntListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.INT_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Integer> getIntListValue() {
+		if (intListValue == null) {
+			intListValue = new EDataTypeEList<Integer>(Integer.class, this, NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);
+		}
+		return intListValue;
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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 NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+				getIntListValue().clear();
+				getIntListValue().addAll((Collection<? extends Integer>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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(" (intListValue: "); //$NON-NLS-1$
+		result.append(intListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // IntListValueStyleImpl
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 8ae6d7b51b0..adfd436a9cf 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
@@ -1,171 +1,171 @@
-/**

- * 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.nattablestyle.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.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Int Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected static final int INT_VALUE_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIntValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected int intValue = INT_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IntValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.INT_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getIntValue() {

-		return intValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setIntValue(int newIntValue) {

-		int oldIntValue = intValue;

-		intValue = newIntValue;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (intValue: "); //$NON-NLS-1$

-		result.append(intValue);

-		result.append(')');

-		return result.toString();

-	}

-} // IntValueStyleImpl

+/**
+ * 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.nattablestyle.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.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected static final int INT_VALUE_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIntValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected int intValue = INT_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IntValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.INT_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getIntValue() {
+		return intValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIntValue(int newIntValue) {
+		int oldIntValue = intValue;
+		intValue = newIntValue;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (intValue: "); //$NON-NLS-1$
+		result.append(intValue);
+		result.append(')');
+		return result.toString();
+	}
+} // IntValueStyleImpl
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 e04f8e41cd8..4f43504c0ea 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
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Named Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-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

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NamedStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.NAMED_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.NAMED_STYLE__NAME:

-				setName(NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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(" (name: "); //$NON-NLS-1$

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-} // NamedStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Named Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+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
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NamedStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.NAMED_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.NAMED_STYLE__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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(" (name: "); //$NON-NLS-1$
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+} // NamedStyleImpl
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 6061581b3dd..de1974c4995 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
@@ -1,352 +1,352 @@
-/**

- * 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.nattablestyle.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleFactoryImpl extends EFactoryImpl implements NattablestyleFactory {

-

-	/**

-	 * 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) {

-				return theNattablestyleFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattablestyleFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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$

-		}

-	}

-

-	/**

-	 * <!-- 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$

-		}

-	}

-

-	/**

-	 * <!-- 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$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NamedStyle createNamedStyle() {

-		NamedStyleImpl namedStyle = new NamedStyleImpl();

-		return namedStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FontStyle createFontStyle() {

-		FontStyleImpl fontStyle = new FontStyleImpl();

-		return fontStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public CellTextStyle createCellTextStyle() {

-		CellTextStyleImpl cellTextStyle = new CellTextStyleImpl();

-		return cellTextStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IntValueStyle createIntValueStyle() {

-		IntValueStyleImpl intValueStyle = new IntValueStyleImpl();

-		return intValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IntListValueStyle createIntListValueStyle() {

-		IntListValueStyleImpl intListValueStyle = new IntListValueStyleImpl();

-		return intListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public BooleanValueStyle createBooleanValueStyle() {

-		BooleanValueStyleImpl booleanValueStyle = new BooleanValueStyleImpl();

-		return booleanValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public BooleanListValueStyle createBooleanListValueStyle() {

-		BooleanListValueStyleImpl booleanListValueStyle = new BooleanListValueStyleImpl();

-		return booleanListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public DoubleValueStyle createDoubleValueStyle() {

-		DoubleValueStyleImpl doubleValueStyle = new DoubleValueStyleImpl();

-		return doubleValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public DoubleListValueStyle createDoubleListValueStyle() {

-		DoubleListValueStyleImpl doubleListValueStyle = new DoubleListValueStyleImpl();

-		return doubleListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public StringValueStyle createStringValueStyle() {

-		StringValueStyleImpl stringValueStyle = new StringValueStyleImpl();

-		return stringValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public StringListValueStyle createStringListValueStyle() {

-		StringListValueStyleImpl stringListValueStyle = new StringListValueStyleImpl();

-		return stringListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableDisplayStyle createTableDisplayStyle() {

-		TableDisplayStyleImpl tableDisplayStyle = new TableDisplayStyleImpl();

-		return tableDisplayStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectValueStyle createEObjectValueStyle() {

-		EObjectValueStyleImpl eObjectValueStyle = new EObjectValueStyleImpl();

-		return eObjectValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectListValueStyle createEObjectListValueStyle() {

-		EObjectListValueStyleImpl eObjectListValueStyle = new EObjectListValueStyleImpl();

-		return eObjectListValueStyle;

-	}

-

-	/**

-	 * <!-- 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$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertCellTextAlignmentToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- 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$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertDisplayStyleToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablestylePackage getNattablestylePackage() {

-		return (NattablestylePackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablestylePackage getPackage() {

-		return NattablestylePackage.eINSTANCE;

-	}

-} // NattablestyleFactoryImpl

+/**
+ * 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.nattablestyle.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleFactoryImpl extends EFactoryImpl implements NattablestyleFactory {
+
+	/**
+	 * 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) {
+				return theNattablestyleFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattablestyleFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- 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$
+		}
+	}
+
+	/**
+	 * <!-- 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$
+		}
+	}
+
+	/**
+	 * <!-- 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$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NamedStyle createNamedStyle() {
+		NamedStyleImpl namedStyle = new NamedStyleImpl();
+		return namedStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FontStyle createFontStyle() {
+		FontStyleImpl fontStyle = new FontStyleImpl();
+		return fontStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CellTextStyle createCellTextStyle() {
+		CellTextStyleImpl cellTextStyle = new CellTextStyleImpl();
+		return cellTextStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IntValueStyle createIntValueStyle() {
+		IntValueStyleImpl intValueStyle = new IntValueStyleImpl();
+		return intValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IntListValueStyle createIntListValueStyle() {
+		IntListValueStyleImpl intListValueStyle = new IntListValueStyleImpl();
+		return intListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public BooleanValueStyle createBooleanValueStyle() {
+		BooleanValueStyleImpl booleanValueStyle = new BooleanValueStyleImpl();
+		return booleanValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public BooleanListValueStyle createBooleanListValueStyle() {
+		BooleanListValueStyleImpl booleanListValueStyle = new BooleanListValueStyleImpl();
+		return booleanListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DoubleValueStyle createDoubleValueStyle() {
+		DoubleValueStyleImpl doubleValueStyle = new DoubleValueStyleImpl();
+		return doubleValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DoubleListValueStyle createDoubleListValueStyle() {
+		DoubleListValueStyleImpl doubleListValueStyle = new DoubleListValueStyleImpl();
+		return doubleListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public StringValueStyle createStringValueStyle() {
+		StringValueStyleImpl stringValueStyle = new StringValueStyleImpl();
+		return stringValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public StringListValueStyle createStringListValueStyle() {
+		StringListValueStyleImpl stringListValueStyle = new StringListValueStyleImpl();
+		return stringListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableDisplayStyle createTableDisplayStyle() {
+		TableDisplayStyleImpl tableDisplayStyle = new TableDisplayStyleImpl();
+		return tableDisplayStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectValueStyle createEObjectValueStyle() {
+		EObjectValueStyleImpl eObjectValueStyle = new EObjectValueStyleImpl();
+		return eObjectValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectListValueStyle createEObjectListValueStyle() {
+		EObjectListValueStyleImpl eObjectListValueStyle = new EObjectListValueStyleImpl();
+		return eObjectListValueStyle;
+	}
+
+	/**
+	 * <!-- 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$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCellTextAlignmentToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- 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$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertDisplayStyleToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablestylePackage getNattablestylePackage() {
+		return (NattablestylePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablestylePackage getPackage() {
+		return NattablestylePackage.eINSTANCE;
+	}
+} // NattablestyleFactoryImpl
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 3a7b0dfb4f2..bc0a3b77f16 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
@@ -1,940 +1,940 @@
-/**

- * 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.nattablestyle.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestylePackageImpl extends EPackageImpl implements NattablestylePackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass styleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass namedStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass fontStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass cellTextStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass intValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass intListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass booleanValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass booleanListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass doubleValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass doubleListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass stringValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass stringListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass styledElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableDisplayStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EEnum cellTextAlignmentEEnum = null;

-

-	/**

-	 * <!-- 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

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablestylePackageImpl() {

-		super(eNS_URI, NattablestyleFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link 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);

-

-		// 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();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		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);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablestylePackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablestylePackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.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;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStyle() {

-		return styleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getNamedStyle() {

-		return namedStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getNamedStyle_Name() {

-		return (EAttribute)namedStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFontStyle() {

-		return fontStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_FontColor() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_FontName() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_FontHeight() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_Bold() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_Italic() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_Underline() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_StrikeThrough() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getCellTextStyle() {

-		return cellTextStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getCellTextStyle_Alignment() {

-		return (EAttribute)cellTextStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIntValueStyle() {

-		return intValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIntValueStyle_IntValue() {

-		return (EAttribute)intValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIntListValueStyle() {

-		return intListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIntListValueStyle_IntListValue() {

-		return (EAttribute)intListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getBooleanValueStyle() {

-		return booleanValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getBooleanValueStyle_BooleanValue() {

-		return (EAttribute)booleanValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getBooleanListValueStyle() {

-		return booleanListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getBooleanListValueStyle_BooleanListValue() {

-		return (EAttribute)booleanListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getDoubleValueStyle() {

-		return doubleValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getDoubleValueStyle_DoubleValue() {

-		return (EAttribute)doubleValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getDoubleListValueStyle() {

-		return doubleListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getDoubleListValueStyle_DoubleListValue() {

-		return (EAttribute)doubleListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStringValueStyle() {

-		return stringValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringValueStyle_StringValue() {

-		return (EAttribute)stringValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStringListValueStyle() {

-		return stringListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringListValueStyle_StringListValue() {

-		return (EAttribute)stringListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStyledElement() {

-		return styledElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getStyledElement_Styles() {

-		return (EReference)styledElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getStyledElement__GetNamedStyle__EClass_String() {

-		return styledElementEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getStyledElement__GetStyle__EClass() {

-		return styledElementEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getStyledElement__CreateStyle__EClass() {

-		return styledElementEClass.getEOperations().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTableDisplayStyle() {

-		return tableDisplayStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableDisplayStyle_DisplayStyle() {

-		return (EAttribute)tableDisplayStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectValueStyle() {

-		return eObjectValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectValueStyle_EObjectValue() {

-		return (EReference)eObjectValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectListValueStyle() {

-		return eObjectListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectListValueStyle_EObjectValue() {

-		return (EReference)eObjectListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EEnum getCellTextAlignment() {

-		return cellTextAlignmentEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EEnum getDisplayStyle() {

-		return displayStyleEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablestyleFactory getNattablestyleFactory() {

-		return (NattablestyleFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		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);

-		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_HEIGHT);

-		createEAttribute(fontStyleEClass, FONT_STYLE__BOLD);

-		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);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		styleEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		namedStyleEClass.getESuperTypes().add(this.getStyle());

-		fontStyleEClass.getESuperTypes().add(this.getStyle());

-		cellTextStyleEClass.getESuperTypes().add(this.getStyle());

-		intValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		intListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		booleanValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		booleanListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		doubleValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		doubleListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		stringValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		stringListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		styledElementEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		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$

-		initEAttribute(getFontStyle_FontHeight(), ecorePackage.getEInt(), "fontHeight", "9", 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_Bold(), ecorePackage.getEBoolean(), "bold", "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_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);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_CENTER);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_RIGHT);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_LEFT);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_CENTER);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_RIGHT);

-		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);

-		addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN);

-	}

-} // NattablestylePackageImpl

+/**
+ * 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.nattablestyle.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestylePackageImpl extends EPackageImpl implements NattablestylePackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass styleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass namedStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass fontStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cellTextStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass intValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass intListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass booleanValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass booleanListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass doubleValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass doubleListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stringValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stringListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass styledElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableDisplayStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum cellTextAlignmentEEnum = null;
+
+	/**
+	 * <!-- 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
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablestylePackageImpl() {
+		super(eNS_URI, NattablestyleFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link 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);
+
+		// 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();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		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);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablestylePackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablestylePackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.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;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStyle() {
+		return styleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getNamedStyle() {
+		return namedStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getNamedStyle_Name() {
+		return (EAttribute)namedStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFontStyle() {
+		return fontStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_FontColor() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_FontName() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_FontHeight() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_Bold() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_Italic() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_Underline() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_StrikeThrough() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCellTextStyle() {
+		return cellTextStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getCellTextStyle_Alignment() {
+		return (EAttribute)cellTextStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIntValueStyle() {
+		return intValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIntValueStyle_IntValue() {
+		return (EAttribute)intValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIntListValueStyle() {
+		return intListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIntListValueStyle_IntListValue() {
+		return (EAttribute)intListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getBooleanValueStyle() {
+		return booleanValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getBooleanValueStyle_BooleanValue() {
+		return (EAttribute)booleanValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getBooleanListValueStyle() {
+		return booleanListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getBooleanListValueStyle_BooleanListValue() {
+		return (EAttribute)booleanListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getDoubleValueStyle() {
+		return doubleValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDoubleValueStyle_DoubleValue() {
+		return (EAttribute)doubleValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getDoubleListValueStyle() {
+		return doubleListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDoubleListValueStyle_DoubleListValue() {
+		return (EAttribute)doubleListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStringValueStyle() {
+		return stringValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringValueStyle_StringValue() {
+		return (EAttribute)stringValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStringListValueStyle() {
+		return stringListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringListValueStyle_StringListValue() {
+		return (EAttribute)stringListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStyledElement() {
+		return styledElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getStyledElement_Styles() {
+		return (EReference)styledElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getStyledElement__GetNamedStyle__EClass_String() {
+		return styledElementEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getStyledElement__GetStyle__EClass() {
+		return styledElementEClass.getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getStyledElement__CreateStyle__EClass() {
+		return styledElementEClass.getEOperations().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTableDisplayStyle() {
+		return tableDisplayStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableDisplayStyle_DisplayStyle() {
+		return (EAttribute)tableDisplayStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectValueStyle() {
+		return eObjectValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectValueStyle_EObjectValue() {
+		return (EReference)eObjectValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectListValueStyle() {
+		return eObjectListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectListValueStyle_EObjectValue() {
+		return (EReference)eObjectListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCellTextAlignment() {
+		return cellTextAlignmentEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getDisplayStyle() {
+		return displayStyleEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablestyleFactory getNattablestyleFactory() {
+		return (NattablestyleFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		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);
+		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_HEIGHT);
+		createEAttribute(fontStyleEClass, FONT_STYLE__BOLD);
+		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);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		styleEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
+		namedStyleEClass.getESuperTypes().add(this.getStyle());
+		fontStyleEClass.getESuperTypes().add(this.getStyle());
+		cellTextStyleEClass.getESuperTypes().add(this.getStyle());
+		intValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		intListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		booleanValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		booleanListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		doubleValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		doubleListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		stringValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		stringListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		styledElementEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
+		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$
+		initEAttribute(getFontStyle_FontHeight(), ecorePackage.getEInt(), "fontHeight", "9", 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_Bold(), ecorePackage.getEBoolean(), "bold", "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_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);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_CENTER);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_RIGHT);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_LEFT);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_CENTER);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_RIGHT);
+		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);
+		addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN);
+	}
+} // NattablestylePackageImpl
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 8790bd928a3..f7c7e342502 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
@@ -1,155 +1,155 @@
-/**

- * 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.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String List Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class StringListValueStyleImpl extends NamedStyleImpl implements StringListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getStringListValue() <em>String List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStringListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> stringListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<String> getStringListValue() {

-		if (stringListValue == null) {

-			stringListValue = new EDataTypeEList<String>(String.class, this, NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);

-		}

-		return stringListValue;

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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 NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-				getStringListValue().clear();

-				getStringListValue().addAll((Collection<? extends String>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		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(" (stringListValue: "); //$NON-NLS-1$

-		result.append(stringListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // StringListValueStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String List Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringListValueStyleImpl extends NamedStyleImpl implements StringListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getStringListValue() <em>String List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> stringListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<String> getStringListValue() {
+		if (stringListValue == null) {
+			stringListValue = new EDataTypeEList<String>(String.class, this, NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);
+		}
+		return stringListValue;
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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 NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+				getStringListValue().clear();
+				getStringListValue().addAll((Collection<? extends String>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		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(" (stringListValue: "); //$NON-NLS-1$
+		result.append(stringListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // StringListValueStyleImpl
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 4f2cfc652c1..a83c0f82378 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
@@ -1,171 +1,171 @@
-/**

- * 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.nattablestyle.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.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String Value Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class StringValueStyleImpl extends NamedStyleImpl implements StringValueStyle {

-

-	/**

-	 * The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStringValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String STRING_VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getStringValue() <em>String Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStringValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String stringValue = STRING_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.STRING_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getStringValue() {

-		return stringValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setStringValue(String newStringValue) {

-		String oldStringValue = stringValue;

-		stringValue = newStringValue;

-		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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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(" (stringValue: "); //$NON-NLS-1$

-		result.append(stringValue);

-		result.append(')');

-		return result.toString();

-	}

-} // StringValueStyleImpl

+/**
+ * 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.nattablestyle.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.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String Value Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringValueStyleImpl extends NamedStyleImpl implements StringValueStyle {
+
+	/**
+	 * The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STRING_VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String stringValue = STRING_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.STRING_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getStringValue() {
+		return stringValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStringValue(String newStringValue) {
+		String oldStringValue = stringValue;
+		stringValue = newStringValue;
+		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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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(" (stringValue: "); //$NON-NLS-1$
+		result.append(stringValue);
+		result.append(')');
+		return result.toString();
+	}
+} // StringValueStyleImpl
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 20557c5b31b..4c6fd060d79 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
@@ -1,237 +1,237 @@
-/**

- * 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.nattablestyle.impl;

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.Collection;

-import java.util.Iterator;

-

-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.EModelElementImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Styled Element</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public abstract class StyledElementImpl extends EModelElementImpl implements StyledElement {

-

-	/**

-	 * The cached value of the '{@link #getStyles() <em>Styles</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStyles()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Style> styles;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StyledElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.STYLED_ELEMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Style> getStyles() {

-		if (styles == null) {

-			styles = new EObjectContainmentEList<Style>(Style.class, this, NattablestylePackage.STYLED_ELEMENT__STYLES);

-		}

-		return styles;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public NamedStyle getNamedStyle(EClass eClass, String name) {

-		if(eClass != null && eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES) && NattablestylePackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {

-			for(Iterator i = getStyles().iterator(); i.hasNext();) {

-				Style style = (Style)i.next();

-				if(style.eClass() == eClass || eClass.isInstance(style)) {

-					if(style.eGet(NattablestylePackage.eINSTANCE.getNamedStyle_Name()).equals(name)) {

-						return (NamedStyle)style;

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public Style getStyle(EClass eClass) {

-		if(eClass != null && NattablestylePackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {

-			if(eClass.isSuperTypeOf(eClass())) {

-				return (Style)this;

-			}

-			if(eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES)) {

-				for(Iterator<?> i = getStyles().iterator(); i.hasNext();) {

-					Style style = (Style)i.next();

-					if(style.eClass() == eClass || eClass.isInstance(style)) {

-						return style;

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public Style createStyle(EClass eClass) {

-		Style newStyle = (Style)eClass.getEPackage().getEFactoryInstance().create(eClass);

-		getStyles().add(newStyle);

-		return newStyle;

-	}

-

-	/**

-	 * <!-- 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);

-		}

-		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 NattablestylePackage.STYLED_ELEMENT__STYLES:

-				return getStyles();

-		}

-		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 NattablestylePackage.STYLED_ELEMENT__STYLES:

-				getStyles().clear();

-				getStyles().addAll((Collection<? extends Style>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				getStyles().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- 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));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-} // StyledElementImpl

+/**
+ * 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.nattablestyle.impl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.Iterator;
+
+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.EModelElementImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Styled Element</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class StyledElementImpl extends EModelElementImpl implements StyledElement {
+
+	/**
+	 * The cached value of the '{@link #getStyles() <em>Styles</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStyles()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Style> styles;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StyledElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.STYLED_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Style> getStyles() {
+		if (styles == null) {
+			styles = new EObjectContainmentEList<Style>(Style.class, this, NattablestylePackage.STYLED_ELEMENT__STYLES);
+		}
+		return styles;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public NamedStyle getNamedStyle(EClass eClass, String name) {
+		if(eClass != null && eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES) && NattablestylePackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
+			for(Iterator i = getStyles().iterator(); i.hasNext();) {
+				Style style = (Style)i.next();
+				if(style.eClass() == eClass || eClass.isInstance(style)) {
+					if(style.eGet(NattablestylePackage.eINSTANCE.getNamedStyle_Name()).equals(name)) {
+						return (NamedStyle)style;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public Style getStyle(EClass eClass) {
+		if(eClass != null && NattablestylePackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
+			if(eClass.isSuperTypeOf(eClass())) {
+				return (Style)this;
+			}
+			if(eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES)) {
+				for(Iterator<?> i = getStyles().iterator(); i.hasNext();) {
+					Style style = (Style)i.next();
+					if(style.eClass() == eClass || eClass.isInstance(style)) {
+						return style;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public Style createStyle(EClass eClass) {
+		Style newStyle = (Style)eClass.getEPackage().getEFactoryInstance().create(eClass);
+		getStyles().add(newStyle);
+		return newStyle;
+	}
+
+	/**
+	 * <!-- 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);
+		}
+		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 NattablestylePackage.STYLED_ELEMENT__STYLES:
+				return getStyles();
+		}
+		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 NattablestylePackage.STYLED_ELEMENT__STYLES:
+				getStyles().clear();
+				getStyles().addAll((Collection<? extends Style>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				getStyles().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- 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));
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+} // StyledElementImpl
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 795f2191694..7fa2138d2ef 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
@@ -1,173 +1,173 @@
-/**

- * 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.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Display Style</b></em>'.

- * <!-- 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>

- * </ul>

- *

- * @generated

- */

-public class TableDisplayStyleImpl extends EModelElementImpl implements TableDisplayStyle {

-

-	/**

-	 * The default value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDisplayStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final DisplayStyle DISPLAY_STYLE_EDEFAULT = DisplayStyle.NORMAL;

-

-	/**

-	 * The cached value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDisplayStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected DisplayStyle displayStyle = DISPLAY_STYLE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableDisplayStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.TABLE_DISPLAY_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public DisplayStyle getDisplayStyle() {

-		return displayStyle;

-	}

-

-	/**

-	 * <!-- 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())

-			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();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- 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;

-		}

-		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(" (displayStyle: "); //$NON-NLS-1$

-		result.append(displayStyle);

-		result.append(')');

-		return result.toString();

-	}

-} // TableDisplayStyleImpl

+/**
+ * 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.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Display Style</b></em>'.
+ * <!-- 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>
+ * </ul>
+ *
+ * @generated
+ */
+public class TableDisplayStyleImpl extends EModelElementImpl implements TableDisplayStyle {
+
+	/**
+	 * The default value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final DisplayStyle DISPLAY_STYLE_EDEFAULT = DisplayStyle.NORMAL;
+
+	/**
+	 * The cached value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected DisplayStyle displayStyle = DISPLAY_STYLE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableDisplayStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.TABLE_DISPLAY_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DisplayStyle getDisplayStyle() {
+		return displayStyle;
+	}
+
+	/**
+	 * <!-- 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())
+			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();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- 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;
+		}
+		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(" (displayStyle: "); //$NON-NLS-1$
+		result.append(displayStyle);
+		result.append(')');
+		return result.toString();
+	}
+} // TableDisplayStyleImpl
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 eea77984996..821e0a2ca22 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
@@ -1,430 +1,430 @@
-/**

- * 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.nattablestyle.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

- * @generated

- */

-public class NattablestyleAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablestylePackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablestylePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected 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();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>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.Style

-	 * @generated

-	 */

-	public Adapter createStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createNamedStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createFontStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createCellTextStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createIntValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createIntListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createBooleanValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createBooleanListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createDoubleValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createDoubleListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createStringValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createStringListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createTableDisplayStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEObjectValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createEObjectListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattablestyleAdapterFactory

+/**
+ * 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.nattablestyle.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage
+ * @generated
+ */
+public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablestylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablestylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected 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();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>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.Style
+	 * @generated
+	 */
+	public Adapter createStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createNamedStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createFontStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createCellTextStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createIntValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createIntListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createBooleanValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createBooleanListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createDoubleValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createDoubleListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createStringValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createStringListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createTableDisplayStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEObjectValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createEObjectListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattablestyleAdapterFactory
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 63022df527e..b0c1706ebac 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
@@ -1,504 +1,504 @@
-/**

- * 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.nattablestyle.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

- * @generated

- */

-public class NattablestyleSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablestylePackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablestylePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case 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);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyle(Style object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Named Style</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>Named Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseNamedStyle(NamedStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Font Style</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>Font Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFontStyle(FontStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Cell Text Style</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>Cell Text Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCellTextStyle(CellTextStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Int Value Style</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>Int Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIntValueStyle(IntValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Int List Value Style</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>Int List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIntListValueStyle(IntListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Value Style</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>Boolean Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBooleanValueStyle(BooleanValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Boolean List Value Style</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>Boolean List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBooleanListValueStyle(BooleanListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Double Value Style</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>Double Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDoubleValueStyle(DoubleValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Double List Value Style</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>Double List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDoubleListValueStyle(DoubleListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String Value Style</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>String Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringValueStyle(StringValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String List Value Style</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>String List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringListValueStyle(StringListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Display Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Display Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableDisplayStyle(TableDisplayStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectValueStyle(EObjectValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectListValueStyle(EObjectListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattablestyleSwitch

+/**
+ * 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.nattablestyle.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage
+ * @generated
+ */
+public class NattablestyleSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablestylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablestylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case 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);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyle(Style object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Named Style</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>Named Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNamedStyle(NamedStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Font Style</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>Font Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFontStyle(FontStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cell Text Style</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>Cell Text Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCellTextStyle(CellTextStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Int Value Style</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>Int Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIntValueStyle(IntValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Int List Value Style</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>Int List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIntListValueStyle(IntListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean Value Style</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>Boolean Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBooleanValueStyle(BooleanValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean List Value Style</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>Boolean List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBooleanListValueStyle(BooleanListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Double Value Style</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>Double Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDoubleValueStyle(DoubleValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Double List Value Style</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>Double List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDoubleListValueStyle(DoubleListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String Value Style</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>String Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringValueStyle(StringValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String List Value Style</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>String List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringListValueStyle(StringListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Display Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Display Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableDisplayStyle(TableDisplayStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectValueStyle(EObjectValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectListValueStyle(EObjectListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattablestyleSwitch
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 988154c209a..1c9ae526447 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
@@ -1,43 +1,43 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class for the tester.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getAbstractTableTester()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractTableTester extends StyledElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns an object representing the tester

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getTester();

-} // AbstractTableTester

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract class for the tester.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getAbstractTableTester()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractTableTester extends StyledElement {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Returns an object representing the tester
+	 * <!-- end-model-doc -->
+	 * @model kind="operation"
+	 * @generated
+	 */
+	Object getTester();
+} // AbstractTableTester
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 82d832c45c1..27621420478 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
@@ -1,63 +1,63 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Java Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- 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.

- * 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>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester()

- * @model

- * @generated

- */

-public interface JavaTableTester extends AbstractTableTester {

-

-	/**

-	 * Returns the value of the '<em><b>Tester</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- 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()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	String getTester();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Tester</em>' attribute.

-	 * @see #getTester()

-	 * @generated

-	 */

-	void setTester(String value);

-} // JavaTableTester

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Java Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- 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.
+ * 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>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester()
+ * @model
+ * @generated
+ */
+public interface JavaTableTester extends AbstractTableTester {
+
+	/**
+	 * Returns the value of the '<em><b>Tester</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- 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()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	String getTester();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tester</em>' attribute.
+	 * @see #getTester()
+	 * @generated
+	 */
+	void setTester(String value);
+} // JavaTableTester
diff --git a/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 38e53a676cc..7e3842c3239 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
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

- * @generated

- */

-public interface NattabletesterFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattabletesterFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Java Table Tester</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Java Table Tester</em>'.

-	 * @generated

-	 */

-	JavaTableTester createJavaTableTester();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattabletesterPackage getNattabletesterPackage();

-} // NattabletesterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
+ * @generated
+ */
+public interface NattabletesterFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattabletesterFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Java Table Tester</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Java Table Tester</em>'.
+	 * @generated
+	 */
+	JavaTableTester createJavaTableTester();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattabletesterPackage getNattabletesterPackage();
+} // NattabletesterFactory
diff --git a/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 1261f3665e0..79910772304 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
@@ -1,363 +1,363 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory

- * @model kind="package"

- * @generated

- */

-public interface NattabletesterPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattabletester"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattabletester"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattabletesterPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()

-	 * @generated

-	 */

-	int ABSTRACT_TABLE_TESTER = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The number of structural features of the '<em>Abstract Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Tester</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_TESTER = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Abstract Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER_OPERATION_COUNT = 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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()

-	 * @generated

-	 */

-	int JAVA_TABLE_TESTER = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER__EANNOTATIONS = ABSTRACT_TABLE_TESTER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER__STYLES = ABSTRACT_TABLE_TESTER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Tester</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER__TESTER = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Java Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER_FEATURE_COUNT = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_EANNOTATION__STRING = ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___CREATE_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Tester</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_TESTER = ABSTRACT_TABLE_TESTER___GET_TESTER;

-

-	/**

-	 * The number of operations of the '<em>Java Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_TESTER_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Abstract Table Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

-	 * @generated

-	 */

-	EClass getAbstractTableTester();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester() <em>Get Tester</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Tester</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()

-	 * @generated

-	 */

-	EOperation getAbstractTableTester__GetTester();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Java Table Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

-	 * @generated

-	 */

-	EClass getJavaTableTester();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester()

-	 * @see #getJavaTableTester()

-	 * @generated

-	 */

-	EAttribute getJavaTableTester_Tester();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattabletesterFactory getNattabletesterFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()

-		 * @generated

-		 */

-		EClass ABSTRACT_TABLE_TESTER = eINSTANCE.getAbstractTableTester();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Tester</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation ABSTRACT_TABLE_TESTER___GET_TESTER = eINSTANCE.getAbstractTableTester__GetTester();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()

-		 * @generated

-		 */

-		EClass JAVA_TABLE_TESTER = eINSTANCE.getJavaTableTester();

-

-		/**

-		 * The meta object literal for the '<em><b>Tester</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute JAVA_TABLE_TESTER__TESTER = eINSTANCE.getJavaTableTester_Tester();

-	}

-} // NattabletesterPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattabletesterPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattabletester"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattabletester"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattabletesterPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()
+	 * @generated
+	 */
+	int ABSTRACT_TABLE_TESTER = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Tester</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_TESTER = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Abstract Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER_OPERATION_COUNT = 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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()
+	 * @generated
+	 */
+	int JAVA_TABLE_TESTER = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER__EANNOTATIONS = ABSTRACT_TABLE_TESTER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER__STYLES = ABSTRACT_TABLE_TESTER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Tester</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER__TESTER = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Java Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER_FEATURE_COUNT = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_EANNOTATION__STRING = ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___CREATE_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Tester</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_TESTER = ABSTRACT_TABLE_TESTER___GET_TESTER;
+
+	/**
+	 * The number of operations of the '<em>Java Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_TESTER_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Table Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
+	 * @generated
+	 */
+	EClass getAbstractTableTester();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester() <em>Get Tester</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Tester</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()
+	 * @generated
+	 */
+	EOperation getAbstractTableTester__GetTester();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Java Table Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
+	 * @generated
+	 */
+	EClass getJavaTableTester();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester()
+	 * @see #getJavaTableTester()
+	 * @generated
+	 */
+	EAttribute getJavaTableTester_Tester();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattabletesterFactory getNattabletesterFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()
+		 * @generated
+		 */
+		EClass ABSTRACT_TABLE_TESTER = eINSTANCE.getAbstractTableTester();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Tester</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation ABSTRACT_TABLE_TESTER___GET_TESTER = eINSTANCE.getAbstractTableTester__GetTester();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()
+		 * @generated
+		 */
+		EClass JAVA_TABLE_TESTER = eINSTANCE.getJavaTableTester();
+
+		/**
+		 * The meta object literal for the '<em><b>Tester</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute JAVA_TABLE_TESTER__TESTER = eINSTANCE.getJavaTableTester_Tester();
+	}
+} // NattabletesterPackage
diff --git a/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 2d5cd33d9ea..d88952e94be 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
@@ -1,76 +1,76 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Abstract Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public abstract class AbstractTableTesterImpl extends StyledElementImpl implements AbstractTableTester {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AbstractTableTesterImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattabletesterPackage.Literals.ABSTRACT_TABLE_TESTER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getTester() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:

-				return getTester();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-} // AbstractTableTesterImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class AbstractTableTesterImpl extends StyledElementImpl implements AbstractTableTester {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractTableTesterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattabletesterPackage.Literals.ABSTRACT_TABLE_TESTER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getTester() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:
+				return getTester();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+} // AbstractTableTesterImpl
diff --git a/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 6b646a62b77..8be189c6d54 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
@@ -1,171 +1,171 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Java Table Tester</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class JavaTableTesterImpl extends AbstractTableTesterImpl implements JavaTableTester {

-

-	/**

-	 * The default value of the '{@link #getTester() <em>Tester</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTester()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TESTER_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTester() <em>Tester</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTester()

-	 * @generated

-	 * @ordered

-	 */

-	protected String tester = TESTER_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected JavaTableTesterImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattabletesterPackage.Literals.JAVA_TABLE_TESTER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getTester() {

-		return tester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setTester(String newTester) {

-		String oldTester = tester;

-		tester = newTester;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattabletesterPackage.JAVA_TABLE_TESTER__TESTER, oldTester, tester));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				return getTester();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				setTester((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				setTester(TESTER_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (tester: "); //$NON-NLS-1$

-		result.append(tester);

-		result.append(')');

-		return result.toString();

-	}

-} // JavaTableTesterImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Java Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class JavaTableTesterImpl extends AbstractTableTesterImpl implements JavaTableTester {
+
+	/**
+	 * The default value of the '{@link #getTester() <em>Tester</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTester()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TESTER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTester() <em>Tester</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTester()
+	 * @generated
+	 * @ordered
+	 */
+	protected String tester = TESTER_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected JavaTableTesterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattabletesterPackage.Literals.JAVA_TABLE_TESTER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getTester() {
+		return tester;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTester(String newTester) {
+		String oldTester = tester;
+		tester = newTester;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattabletesterPackage.JAVA_TABLE_TESTER__TESTER, oldTester, tester));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				return getTester();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				setTester((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				setTester(TESTER_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (tester: "); //$NON-NLS-1$
+		result.append(tester);
+		result.append(')');
+		return result.toString();
+	}
+} // JavaTableTesterImpl
diff --git a/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 c51ab445db8..b32e1bce188 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
@@ -1,106 +1,106 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterFactoryImpl extends EFactoryImpl implements NattabletesterFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattabletesterFactory init() {

-		try {

-			NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory)EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);

-			if (theNattabletesterFactory != null) {

-				return theNattabletesterFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattabletesterFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER: return createJavaTableTester();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public JavaTableTester createJavaTableTester() {

-		JavaTableTesterImpl javaTableTester = new JavaTableTesterImpl();

-		return javaTableTester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattabletesterPackage getNattabletesterPackage() {

-		return (NattabletesterPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattabletesterPackage getPackage() {

-		return NattabletesterPackage.eINSTANCE;

-	}

-} // NattabletesterFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterFactoryImpl extends EFactoryImpl implements NattabletesterFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattabletesterFactory init() {
+		try {
+			NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory)EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);
+			if (theNattabletesterFactory != null) {
+				return theNattabletesterFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattabletesterFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER: return createJavaTableTester();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public JavaTableTester createJavaTableTester() {
+		JavaTableTesterImpl javaTableTester = new JavaTableTesterImpl();
+		return javaTableTester;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattabletesterPackage getNattabletesterPackage() {
+		return (NattabletesterPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattabletesterPackage getPackage() {
+		return NattabletesterPackage.eINSTANCE;
+	}
+} // NattabletesterFactoryImpl
diff --git a/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 ad7c1f5be64..16330084f4a 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
@@ -1,289 +1,289 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterPackageImpl extends EPackageImpl implements NattabletesterPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass abstractTableTesterEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass javaTableTesterEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattabletesterPackageImpl() {

-		super(eNS_URI, NattabletesterFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattabletesterPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattabletesterPackage init() {

-		if (isInited) return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		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);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattabletesterPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattabletesterPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattabletesterPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattabletesterPackage.eNS_URI, theNattabletesterPackage);

-		return theNattabletesterPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAbstractTableTester() {

-		return abstractTableTesterEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getAbstractTableTester__GetTester() {

-		return abstractTableTesterEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getJavaTableTester() {

-		return javaTableTesterEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getJavaTableTester_Tester() {

-		return (EAttribute)javaTableTesterEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattabletesterFactory getNattabletesterFactory() {

-		return (NattabletesterFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		abstractTableTesterEClass = createEClass(ABSTRACT_TABLE_TESTER);

-		createEOperation(abstractTableTesterEClass, ABSTRACT_TABLE_TESTER___GET_TESTER);

-

-		javaTableTesterEClass = createEClass(JAVA_TABLE_TESTER);

-		createEAttribute(javaTableTesterEClass, JAVA_TABLE_TESTER__TESTER);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		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$

-	}

-} // NattabletesterPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterPackageImpl extends EPackageImpl implements NattabletesterPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractTableTesterEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass javaTableTesterEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattabletesterPackageImpl() {
+		super(eNS_URI, NattabletesterFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattabletesterPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattabletesterPackage init() {
+		if (isInited) return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		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);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattabletesterPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattabletesterPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattabletesterPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattabletesterPackage.eNS_URI, theNattabletesterPackage);
+		return theNattabletesterPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAbstractTableTester() {
+		return abstractTableTesterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getAbstractTableTester__GetTester() {
+		return abstractTableTesterEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getJavaTableTester() {
+		return javaTableTesterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getJavaTableTester_Tester() {
+		return (EAttribute)javaTableTesterEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattabletesterFactory getNattabletesterFactory() {
+		return (NattabletesterFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		abstractTableTesterEClass = createEClass(ABSTRACT_TABLE_TESTER);
+		createEOperation(abstractTableTesterEClass, ABSTRACT_TABLE_TESTER___GET_TESTER);
+
+		javaTableTesterEClass = createEClass(JAVA_TABLE_TESTER);
+		createEAttribute(javaTableTesterEClass, JAVA_TABLE_TESTER__TESTER);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		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$
+	}
+} // NattabletesterPackageImpl
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 04f131de6e7..4e20b15956b 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
@@ -1,183 +1,183 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

- * @generated

- */

-public class NattabletesterAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattabletesterPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattabletesterPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterSwitch<Adapter> modelSwitch = new NattabletesterSwitch<Adapter>() {

-			@Override

-			public Adapter caseAbstractTableTester(AbstractTableTester object) {

-				return createAbstractTableTesterAdapter();

-			}

-			@Override

-			public Adapter caseJavaTableTester(JavaTableTester object) {

-				return createJavaTableTesterAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter 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.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

-	 * @generated

-	 */

-	public Adapter createAbstractTableTesterAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

-	 * @generated

-	 */

-	public Adapter createJavaTableTesterAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for 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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattabletesterAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
+ * @generated
+ */
+public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattabletesterPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattabletesterPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterSwitch<Adapter> modelSwitch = new NattabletesterSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractTableTester(AbstractTableTester object) {
+				return createAbstractTableTesterAdapter();
+			}
+			@Override
+			public Adapter caseJavaTableTester(JavaTableTester object) {
+				return createJavaTableTesterAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter 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.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
+	 * @generated
+	 */
+	public Adapter createAbstractTableTesterAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
+	 * @generated
+	 */
+	public Adapter createJavaTableTesterAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for 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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattabletesterAdapterFactory
diff --git a/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 d9818786d2f..5e51c88f9c3 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
@@ -1,177 +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.nattabletester.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

- * @generated

- */

-public class NattabletesterSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattabletesterPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattabletesterPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattabletesterPackage.ABSTRACT_TABLE_TESTER: {

-				AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;

-				T result = caseAbstractTableTester(abstractTableTester);

-				if (result == null) result = 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);

-				if (result == null) result = caseEModelElement(javaTableTester);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAbstractTableTester(AbstractTableTester object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseJavaTableTester(JavaTableTester object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattabletesterSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
+ * @generated
+ */
+public class NattabletesterSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattabletesterPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattabletesterPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattabletesterPackage.ABSTRACT_TABLE_TESTER: {
+				AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;
+				T result = caseAbstractTableTester(abstractTableTester);
+				if (result == null) result = 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);
+				if (result == null) result = caseEModelElement(javaTableTester);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractTableTester(AbstractTableTester object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseJavaTableTester(JavaTableTester object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattabletesterSwitch
diff --git a/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 7e3ab2b2523..c9910f6f080 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
@@ -1,183 +1,183 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public class NattableAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablePackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableSwitch<Adapter> modelSwitch = new NattableSwitch<Adapter>() {

-			@Override

-			public Adapter caseTable(Table object) {

-				return createTableAdapter();

-			}

-			@Override

-			public Adapter 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.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table

-	 * @generated

-	 */

-	public Adapter createTableAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+public class NattableAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableSwitch<Adapter> modelSwitch = new NattableSwitch<Adapter>() {
+			@Override
+			public Adapter caseTable(Table object) {
+				return createTableAdapter();
+			}
+			@Override
+			public Adapter 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.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table
+	 * @generated
+	 */
+	public Adapter createTableAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.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
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableAdapterFactory
diff --git a/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 31b73d05b90..9ca8b53f917 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
@@ -1,169 +1,169 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public class NattableSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablePackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattablePackage.TABLE: {

-				Table table = (Table)theEObject;

-				T result = caseTable(table);

-				if (result == null) result = caseTableNamedElement(table);

-				if (result == null) result = caseStyledElement(table);

-				if (result == null) result = caseEModelElement(table);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTable(Table object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+public class NattableSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattablePackage.TABLE: {
+				Table table = (Table)theEObject;
+				T result = caseTable(table);
+				if (result == null) result = caseTableNamedElement(table);
+				if (result == null) result = caseStyledElement(table);
+				if (result == null) result = caseEModelElement(table);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTable(Table object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableSwitch
diff --git a/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 6b11d9d6e65..25451161620 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
@@ -1,237 +1,237 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.EObjectValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-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.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable"; //$NON-NLS-1$

-

-	/**

-	 * 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;

-

-	/**

-	 * 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;

-

-	/**

-	 * The cached base package validator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationValidator nattableconfigurationValidator;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableValidator() {

-		super();

-		nattableconfigurationValidator = NattableconfigurationValidator.INSTANCE;

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  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;

-		}

-	}

-

-	/**

-	 * <!-- 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;

-		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);

-		return result;

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * 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$

-

-	/**

-	 * 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);

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-} // NattableValidator

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Validator</b> for the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+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.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable"; //$NON-NLS-1$
+
+	/**
+	 * 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;
+
+	/**
+	 * 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;
+
+	/**
+	 * The cached base package validator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationValidator nattableconfigurationValidator;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableValidator() {
+		super();
+		nattableconfigurationValidator = NattableconfigurationValidator.INSTANCE;
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  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;
+		}
+	}
+
+	/**
+	 * <!-- 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;
+		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);
+		return result;
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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$
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+} // NattableValidator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index 8b738c578e8..752cc7212a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer,

- org.eclipse.papyrus.infra.nattable.modelexplorer.handlers,

- org.eclipse.papyrus.infra.nattable.modelexplorer.messages,

- org.eclipse.papyrus.infra.nattable.modelexplorer.providers,

- org.eclipse.papyrus.infra.nattable.modelexplorer.queries

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %Bundle-Name

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 3.0.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.handlers,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.messages,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.providers,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.queries
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %Bundle-Name
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Version: 3.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;singleton:=true
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
index 9ab5afc1da5..06003312f1f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.modelexplorer

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.modelexplorer
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Modelexplorer for Tables
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
@@ -1,28 +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>

+<!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/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
index 41a9993db79..4d7085e1bad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-	<description>This plugin provides : - the facets and the customization to display the Papyrus Nattables in the ModelExplorer</description>

+	<description>This plugin provides : - the facets and the customization to display the Papyrus Nattables in the ModelExplorer</description>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom
index 84133ebf51d..b40aa1d4c96 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<custom:Customization

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"

-    xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"

-    xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"

-    name="PapyrusTable"

-    documentation="Display contained table and their icons"

-    mustBeLoadedByDefault="true"

-    rank="-1000">

-  <eClassifiers

-      xsi:type="custom:EClassCustomization"

-      name="Table"

-      documentation="Representation of table in model explorer">

-    <extendedMetaclass

-        href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-    <facetOperations

-        name="GetDiagramLabel"

-        documentation="Return the label of the corresponding table">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eParameters

-          name="eStructuralFeature">

-        <eType

-            xsi:type="ecore:EClass"

-            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

-      </eParameters>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableLabel"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>

-    </facetOperations>

-    <facetOperations

-        name="GetTableIcon"

-        documentation="Return the path to the icon of the corresponding table">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>

-      <eParameters

-          name="eObject">

-        <eType

-            xsi:type="ecore:EClass"

-            href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      </eParameters>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableIcon"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>

-    </facetOperations>

-    <facetOperations

-        name="visibleReferences"

-        upperBound="-1">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.EmptyListQuery"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/visibleReferences"/>

-    </facetOperations>

-  </eClassifiers>

-  <eClassifiers

-      xsi:type="efacet:Facet"

-      name="TableContainer"

-      documentation="this is a container of table"

-      conformanceTypedElement="//TableContainer/isTableContainer">

-    <extendedMetaclass

-        href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <facetOperations

-        name="isTableContainer"

-        documentation="test if it references table">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.IsTableContainer"/>

-    </facetOperations>

-  </eClassifiers>

-  <eClassifiers

-      xsi:type="custom:FacetCustomization"

-      name="TableContainer"

-      documentation="representation of a container of table"

-      extendedFacets="//TableContainer">

-    <facetElements

-        xsi:type="efacet:FacetReference"

-        name="tables"

-        upperBound="-1"

-        defaultValueLiteral=""

-        derived="true">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-      <query

-          xsi:type="query:OperationCallQuery"

-          operation="//TableContainer.1/TablesRefContent"/>

-    </facetElements>

-    <facetOperations

-        name="TablesRefContent"

-        upperBound="-1"

-        documentation="Get the collection of all contained tables">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetContainedTables"/>

-    </facetOperations>

-    <customizedFacet

-        href="platform:/plugin/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom#//TableContainer"/>

-  </eClassifiers>

-</custom:Customization>

+<?xml version="1.0" encoding="UTF-8"?>
+<custom:Customization
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"
+    xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"
+    xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"
+    name="PapyrusTable"
+    documentation="Display contained table and their icons"
+    mustBeLoadedByDefault="true"
+    rank="-1000">
+  <eClassifiers
+      xsi:type="custom:EClassCustomization"
+      name="Table"
+      documentation="Representation of table in model explorer">
+    <extendedMetaclass
+        href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>
+    <facetOperations
+        name="GetDiagramLabel"
+        documentation="Return the label of the corresponding table">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters
+          name="eStructuralFeature">
+        <eType
+            xsi:type="ecore:EClass"
+            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
+      </eParameters>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableLabel"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>
+    </facetOperations>
+    <facetOperations
+        name="GetTableIcon"
+        documentation="Return the path to the icon of the corresponding table">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>
+      <eParameters
+          name="eObject">
+        <eType
+            xsi:type="ecore:EClass"
+            href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+      </eParameters>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableIcon"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>
+    </facetOperations>
+    <facetOperations
+        name="visibleReferences"
+        upperBound="-1">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.EmptyListQuery"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/visibleReferences"/>
+    </facetOperations>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="efacet:Facet"
+      name="TableContainer"
+      documentation="this is a container of table"
+      conformanceTypedElement="//TableContainer/isTableContainer">
+    <extendedMetaclass
+        href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+    <facetOperations
+        name="isTableContainer"
+        documentation="test if it references table">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.IsTableContainer"/>
+    </facetOperations>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="custom:FacetCustomization"
+      name="TableContainer"
+      documentation="representation of a container of table"
+      extendedFacets="//TableContainer">
+    <facetElements
+        xsi:type="efacet:FacetReference"
+        name="tables"
+        upperBound="-1"
+        defaultValueLiteral=""
+        derived="true">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>
+      <query
+          xsi:type="query:OperationCallQuery"
+          operation="//TableContainer.1/TablesRefContent"/>
+    </facetElements>
+    <facetOperations
+        name="TablesRefContent"
+        upperBound="-1"
+        documentation="Get the collection of all contained tables">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetContainedTables"/>
+    </facetOperations>
+    <customizedFacet
+        href="platform:/plugin/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom#//TableContainer"/>
+  </eClassifiers>
+</custom:Customization>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
index 600d390093f..a93830840e7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * 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:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.actions;

-

-import java.util.List;

-

-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.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction;

-import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

-

-public class NattableQuickFormatAction extends AbstractEMFParametricOnSelectedElementsAction {

-

-	public NattableQuickFormatAction(String parameter , List<EObject> selectedElements) {

-		super(parameter, selectedElements);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction#getBuildedCommand()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Command getBuildedCommand() {

-		CompoundCommand cc = new CompoundCommand(NameNormalizationCommand.NAME_ACTION);

-		for(EObject igEP : getSelection()){

-			final TransactionalEditingDomain domain = getEditingDomain();

-			NattableNameNormalizationCommand myCmd = new NattableNameNormalizationCommand(domain, igEP, parameter);

-			cc.append(myCmd);

-		}

-		

-		if (!cc.isEmpty() && cc.canExecute()) {

-			return cc;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.actions;
+
+import java.util.List;
+
+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.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction;
+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;
+
+public class NattableQuickFormatAction extends AbstractEMFParametricOnSelectedElementsAction {
+
+	public NattableQuickFormatAction(String parameter , List<EObject> selectedElements) {
+		super(parameter, selectedElements);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction#getBuildedCommand()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Command getBuildedCommand() {
+		CompoundCommand cc = new CompoundCommand(NameNormalizationCommand.NAME_ACTION);
+		for(EObject igEP : getSelection()){
+			final TransactionalEditingDomain domain = getEditingDomain();
+			NattableNameNormalizationCommand myCmd = new NattableNameNormalizationCommand(domain, igEP, parameter);
+			cc.append(myCmd);
+		}
+		
+		if (!cc.isEmpty() && cc.canExecute()) {
+			return cc;
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
index e9348feb08a..7a6793d5e72 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * 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:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

-

-public class NattableNamePropertyTester extends NamePropertyTester {

-

-	protected boolean isNameChangeable(IStructuredSelection selection){

-		boolean onlyWaitElement=true;

-		if (!selection.isEmpty()) {

-			Iterator<?> iter = selection.iterator();

-			while (iter.hasNext()) {

-				EObject object = EMFHelper.getEObject(iter.next());

-				if ( !(object instanceof TableNamedElement)) {

-					onlyWaitElement  =false;

-					break;

-				}

-			}

-		}

-		return onlyWaitElement;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;
+
+public class NattableNamePropertyTester extends NamePropertyTester {
+
+	protected boolean isNameChangeable(IStructuredSelection selection){
+		boolean onlyWaitElement=true;
+		if (!selection.isEmpty()) {
+			Iterator<?> iter = selection.iterator();
+			while (iter.hasNext()) {
+				EObject object = EMFHelper.getEObject(iter.next());
+				if ( !(object instanceof TableNamedElement)) {
+					onlyWaitElement  =false;
+					break;
+				}
+			}
+		}
+		return onlyWaitElement;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
index a60a085360e..601e211929f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * 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:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.papyrus.infra.nattable.modelexplorer.actions.NattableQuickFormatAction;

-import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

-import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

-

-/**

- * The handler for the {@link NattableQuickFormatAction}

- *

- *

- *

- */

-public class NattableQuickFormatHandler extends AbstractGenericCommandHandler {

-

-	/**

-	 *

-	 * Constructor.

-	 */

-	public NattableQuickFormatHandler() {

-		super();

-	}

-	

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.AbstractGenericCommandHandler#getCommand(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 */

-	@Override

-	protected Command getCommand(ExecutionEvent event) {

-		String parameter = event.getParameter(NamePropertyTester.PARAMETER_ID);

-		

-		NattableQuickFormatAction action = new NattableQuickFormatAction(parameter,getSelectedElements());

-		setBaseEnabled(action.isEnabled());

-		if (action.isEnabled()) {

-			return action.getCommand();

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		NattableQuickFormatAction action = new NattableQuickFormatAction(NameNormalizationCommand.DEFAULT_ACTION, getSelectedElements());

-		setBaseEnabled(action.isEnabled());

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.papyrus.infra.nattable.modelexplorer.actions.NattableQuickFormatAction;
+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;
+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;
+
+/**
+ * The handler for the {@link NattableQuickFormatAction}
+ *
+ *
+ *
+ */
+public class NattableQuickFormatHandler extends AbstractGenericCommandHandler {
+
+	/**
+	 *
+	 * Constructor.
+	 */
+	public NattableQuickFormatHandler() {
+		super();
+	}
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.AbstractGenericCommandHandler#getCommand(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 */
+	@Override
+	protected Command getCommand(ExecutionEvent event) {
+		String parameter = event.getParameter(NamePropertyTester.PARAMETER_ID);
+		
+		NattableQuickFormatAction action = new NattableQuickFormatAction(parameter,getSelectedElements());
+		setBaseEnabled(action.isEnabled());
+		if (action.isEnabled()) {
+			return action.getCommand();
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		NattableQuickFormatAction action = new NattableQuickFormatAction(NameNormalizationCommand.DEFAULT_ACTION, getSelectedElements());
+		setBaseEnabled(action.isEnabled());
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath
@@ -1,7 +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.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties
index 2bde9df26cf..c85a998d072 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.properties

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.properties
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Properties Views for Nattable
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html
@@ -1,28 +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>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!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>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
index 5399ff976dc..dcc74c13f1b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               OSGI-INF/,\

-               model/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               OSGI-INF/,\
+               model/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
index 8141d36f713..2e58eb8a66f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>

-	<version>2.2.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>
+	<version>2.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java
index a9d30c60ea4..e185ffda46b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * 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.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class CanCreateColumnElementContraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		return CreatableEObjectAxisUtils.getCreatableElementIds((Table) table, true).size() != 0;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CanCreateColumnElementContraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		return CreatableEObjectAxisUtils.getCreatableElementIds((Table) table, true).size() != 0;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java
index 985554d87e8..42832c8d7b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class CantCreateColumnElementContraint extends CanCreateColumnElementContraint {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.CanCreateColumnElementContraint#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		return !super.match(selection);

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.constraints;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CantCreateColumnElementContraint extends CanCreateColumnElementContraint {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.CanCreateColumnElementContraint#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		return !super.match(selection);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
index c0c76652517..3b6235f7eb1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- * The java constraint to define the constraint to create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCanCreateColumnElementContraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !CreatableEObjectAxisUtils.getCreatableElementIds(table, true).isEmpty();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ * The java constraint to define the constraint to create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCanCreateColumnElementContraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !CreatableEObjectAxisUtils.getCreatableElementIds(table, true).isEmpty();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
index 23eb949f078..cf890afe953 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- * The java constraint to define the constraint to create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCanCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !super.checkMoreConstraints(table) && !CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ * The java constraint to define the constraint to create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCanCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !super.checkMoreConstraints(table) && !CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java
index 197bf0bd1c2..d80bc172f40 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * The java constraint to define the constraint to not create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCantCreateColumnElementContraint extends EObjectInTableCanCreateColumnElementContraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableCanCreateColumnElementContraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !super.checkMoreConstraints(table);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * The java constraint to define the constraint to not create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCantCreateColumnElementContraint extends EObjectInTableCanCreateColumnElementContraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableCanCreateColumnElementContraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !super.checkMoreConstraints(table);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
index 158a5b30b14..1a2df1a7998 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- * The java constraint to define the constraint to not create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCantCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !super.checkMoreConstraints(table) && CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ * The java constraint to define the constraint to not create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCantCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !super.checkMoreConstraints(table) && CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
index 92ad90320bc..eeaa2de58b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has a feature column label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasColumnFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return null != LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has a feature column label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasColumnFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return null != LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
index 2c558f1acd1..d97e10948a4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has an object column label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasColumnObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);

-		return null != objectConf && null == featureConf;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has an object column label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasColumnObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);
+		return null != objectConf && null == featureConf;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
index ce4019af33a..c0cc9cca09a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has a feature row label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasRowFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return null != LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has a feature row label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasRowFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return null != LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
index 14443d282a4..0c2c1f468ee 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has an object row label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasRowObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);

-		return null != objectConf && null == featureConf;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has an object row label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasRowObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);
+		return null != objectConf && null == featureConf;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
index 8a2127069db..858386f7b07 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The java constraint to check if the table from the active nattable editor has tree filling configuration for the first depth.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasTreeFillingConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return TableHelper.isTreeTable(table) && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0);

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has tree filling configuration for the first depth.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasTreeFillingConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return TableHelper.isTreeTable(table) && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0);
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
index af1e575023e..9c60f052da3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The java constraint to check if the table from the active nattable editor is a flat table.

- * 

- * @since 2.2

- */

-public class EObjectInTableIsFlatTableConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !TableHelper.isTreeTable(table);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The java constraint to check if the table from the active nattable editor is a flat table.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableIsFlatTableConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !TableHelper.isTreeTable(table);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
index af9fec261ae..c29b1295c27 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.ui.util.EditorHelper;

-import org.eclipse.ui.IEditorPart;

-

-/**

- * The java constraint to check if the table from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableJavaConstraint implements JavaQuery {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 */

-	@Override

-	public boolean match(Object selection) {

-		boolean result = false;

-

-		if (null != EditorHelper.getActivePart()) {

-			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();

-			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {

-				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;

-				final Table table = multiDiagramEditor.getActiveEditor().getAdapter(Table.class);

-				if (null != table) {

-					result = checkMoreConstraints(table);

-				}

-			} else if (currentEditor instanceof IAdaptable) {

-				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);

-				result = checkMoreConstraints(table);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * This allows to check more constraint for the match.

-	 * 

-	 * @param table

-	 *            the current table.

-	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.

-	 */

-	protected boolean checkMoreConstraints(final Table table) {

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.ui.util.EditorHelper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * The java constraint to check if the table from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableJavaConstraint implements JavaQuery {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 */
+	@Override
+	public boolean match(Object selection) {
+		boolean result = false;
+
+		if (null != EditorHelper.getActivePart()) {
+			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();
+			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {
+				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;
+				final Table table = multiDiagramEditor.getActiveEditor().getAdapter(Table.class);
+				if (null != table) {
+					result = checkMoreConstraints(table);
+				}
+			} else if (currentEditor instanceof IAdaptable) {
+				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);
+				result = checkMoreConstraints(table);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * This allows to check more constraint for the match.
+	 * 
+	 * @param table
+	 *            the current table.
+	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.
+	 */
+	protected boolean checkMoreConstraints(final Table table) {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
index d6b559d4099..af8bb6ab4dc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * 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.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- *

- * Constraint to know if the table has a feature column label configuration

- *

- */

-public class HasColumnFeatureLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table) != null;

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ *
+ * Constraint to know if the table has a feature column label configuration
+ *
+ */
+public class HasColumnFeatureLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table) != null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
index d95f7393913..d9a079ee879 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * Constraint to know if the table has an object column label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public class HasColumnObjectLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration((Table) table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table);

-		return objectConf != null && featureConf == null;

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * Constraint to know if the table has an object column label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HasColumnObjectLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration((Table) table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table);
+		return objectConf != null && featureConf == null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java
index 9ad92ef31ef..9d5667c7426 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * 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.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- *

- * Constraint to know if the table has a feature row label configuration

- *

- */

-public class HasRowFeatureLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		return LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table) != null;

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ *
+ * Constraint to know if the table has a feature row label configuration
+ *
+ */
+public class HasRowFeatureLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		return LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table) != null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java
index 8888bfd8721..305dce370d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * Constraint to know if the table has an object row label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public class HasRowObjectLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration((Table) table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table);

-		return objectConf != null && featureConf == null;

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * Constraint to know if the table has an object row label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HasRowObjectLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration((Table) table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table);
+		return objectConf != null && featureConf == null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
index 145a525cdbf..7ea1265d292 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The constraint which allow to determinate if this is a nattable editor as current editor part and a flat table.

- * 

- * @since 2.2

- */

-public class IsEObjectInFlatTableConstraint extends IsEObjectInTableConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreTableConstraint(final Table table) {

-		return !TableHelper.isTreeTable(table);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)

-	 */

-	@Override

-	protected boolean equivalent(final Constraint constraint) {

-		return constraint == this || constraint instanceof IsEObjectInFlatTableConstraint;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The constraint which allow to determinate if this is a nattable editor as current editor part and a flat table.
+ * 
+ * @since 2.2
+ */
+public class IsEObjectInFlatTableConstraint extends IsEObjectInTableConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreTableConstraint(final Table table) {
+		return !TableHelper.isTreeTable(table);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 */
+	@Override
+	protected boolean equivalent(final Constraint constraint) {
+		return constraint == this || constraint instanceof IsEObjectInFlatTableConstraint;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
index 54785436e94..ab66a5437c5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
@@ -1,103 +1,103 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.ui.util.EditorHelper;

-import org.eclipse.ui.IEditorPart;

-

-/**

- * The constraint which allow to determinate if this is a nattable editor as current editor part.

- * 

- * @since 2.2

- */

-public class IsEObjectInTableConstraint extends AbstractConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.util.Collection)

-	 */

-	@Override

-	public boolean match(final Collection<?> selection) {

-		return match();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.lang.Object)

-	 */

-	@Override

-	public boolean match(final Object selection) {

-		return match();

-	}

-

-	/**

-	 * This allows to determinate if this is match with the current nattable editor.

-	 * 

-	 * @return <code>true</code> if the current nattable editor is open and matching with the expected value, <code>false</code> otherwise.

-	 */

-	protected boolean match() {

-		boolean result = false;

-

-		final boolean expectedValue = Boolean.parseBoolean(getValue("expectedValue")); //$NON-NLS-1$

-

-		if (null != EditorHelper.getActivePart()) {

-			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();

-			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {

-				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;

-				result = EditorHelper.getActivePart().equals(currentEditor)

-						&& null != multiDiagramEditor.getActiveEditor().getAdapter(NatTableEditor.class)

-						&& checkMoreTableConstraint(((NatTableEditor) multiDiagramEditor.getActiveEditor()).getTable());

-			} else if (currentEditor instanceof IAdaptable) {

-				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);

-				result = null != table

-						&& EditorHelper.getActivePart().equals(currentEditor)

-						&& checkMoreTableConstraint(table);

-			}

-		}

-

-		return expectedValue == result;

-	}

-

-	/**

-	 * This allows to check more constraint for the match.

-	 * 

-	 * @param table

-	 *            the current table.

-	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.

-	 */

-	protected boolean checkMoreTableConstraint(final Table table) {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)

-	 */

-	@Override

-	protected boolean equivalent(final Constraint constraint) {

-		return constraint == this || constraint instanceof IsEObjectInTableConstraint;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.ui.util.EditorHelper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * The constraint which allow to determinate if this is a nattable editor as current editor part.
+ * 
+ * @since 2.2
+ */
+public class IsEObjectInTableConstraint extends AbstractConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.util.Collection)
+	 */
+	@Override
+	public boolean match(final Collection<?> selection) {
+		return match();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.lang.Object)
+	 */
+	@Override
+	public boolean match(final Object selection) {
+		return match();
+	}
+
+	/**
+	 * This allows to determinate if this is match with the current nattable editor.
+	 * 
+	 * @return <code>true</code> if the current nattable editor is open and matching with the expected value, <code>false</code> otherwise.
+	 */
+	protected boolean match() {
+		boolean result = false;
+
+		final boolean expectedValue = Boolean.parseBoolean(getValue("expectedValue")); //$NON-NLS-1$
+
+		if (null != EditorHelper.getActivePart()) {
+			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();
+			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {
+				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;
+				result = EditorHelper.getActivePart().equals(currentEditor)
+						&& null != multiDiagramEditor.getActiveEditor().getAdapter(NatTableEditor.class)
+						&& checkMoreTableConstraint(((NatTableEditor) multiDiagramEditor.getActiveEditor()).getTable());
+			} else if (currentEditor instanceof IAdaptable) {
+				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);
+				result = null != table
+						&& EditorHelper.getActivePart().equals(currentEditor)
+						&& checkMoreTableConstraint(table);
+			}
+		}
+
+		return expectedValue == result;
+	}
+
+	/**
+	 * This allows to check more constraint for the match.
+	 * 
+	 * @param table
+	 *            the current table.
+	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.
+	 */
+	protected boolean checkMoreTableConstraint(final Table table) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 */
+	@Override
+	protected boolean equivalent(final Constraint constraint) {
+		return constraint == this || constraint instanceof IsEObjectInTableConstraint;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
index 7f6e52415d3..98a484dae8b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2016 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The constraint which allow to determinate if this is a nattable editor as current editor part and a tree table.

- * 

- * @since 2.2

- */

-public class IsEObjectInTreeTableConstraint extends IsEObjectInTableConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreTableConstraint(final Table table) {

-		return TableHelper.isTreeTable(table);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)

-	 */

-	@Override

-	protected boolean equivalent(final Constraint constraint) {

-		return constraint == this || constraint instanceof IsEObjectInTreeTableConstraint;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The constraint which allow to determinate if this is a nattable editor as current editor part and a tree table.
+ * 
+ * @since 2.2
+ */
+public class IsEObjectInTreeTableConstraint extends IsEObjectInTableConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreTableConstraint(final Table table) {
+		return TableHelper.isTreeTable(table);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 */
+	@Override
+	protected boolean equivalent(final Constraint constraint) {
+		return constraint == this || constraint instanceof IsEObjectInTreeTableConstraint;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java
index 3be2ac7c641..4034d02311f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The colulmn observable value for {@link AbstractHeaderAxisConfiguration#displayFilter}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnDisplayFilterHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnDisplayFilterHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The colulmn observable value for {@link AbstractHeaderAxisConfiguration#displayFilter}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnDisplayFilterHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnDisplayFilterHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java
index ba3a43f0591..6e4626f9baa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The column observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnDisplayIndexHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnDisplayIndexHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The column observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnDisplayIndexHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnDisplayIndexHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java
index 94cb5321d61..fac0a621473 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- *

- * The column observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnDisplayLabelHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnDisplayLabelHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ *
+ * The column observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnDisplayLabelHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnDisplayLabelHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
index 0542d873cab..ab1e6748355 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The Class ColumnFeatureLabelDisplayIconObservableValue.

- *

- * @author Vincent Lorenzo

- */

-public class ColumnFeatureLabelDisplayIconObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * Gets the value type.

-	 *

-	 * @return the value type

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The Class ColumnFeatureLabelDisplayIconObservableValue.
+ *
+ * @author Vincent Lorenzo
+ */
+public class ColumnFeatureLabelDisplayIconObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * Gets the value type.
+	 *
+	 * @return the value type
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
index 565612277aa..463ce910966 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayIsDerivedObservableValue.

- */

-public class ColumnFeatureLabelDisplayIsDerivedObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display is derived observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayIsDerivedObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayIsDerivedObservableValue.
+ */
+public class ColumnFeatureLabelDisplayIsDerivedObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display is derived observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayIsDerivedObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
index feb23bb53c3..317104dc31a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayLabelObservableValue.

- */

-public class ColumnFeatureLabelDisplayLabelObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayLabelObservableValue.
+ */
+public class ColumnFeatureLabelDisplayLabelObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
index 3f5af80c95a..0b6d2b4d3c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayMultiplicityObservableValue.

- */

-public class ColumnFeatureLabelDisplayMultiplicityObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display multiplicity observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayMultiplicityObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayMultiplicityObservableValue.
+ */
+public class ColumnFeatureLabelDisplayMultiplicityObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display multiplicity observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayMultiplicityObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
index 23208ca452b..c595f37fb45 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayNameObservableValue.

- */

-public class ColumnFeatureLabelDisplayNameObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display name observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayNameObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayNameObservableValue.
+ */
+public class ColumnFeatureLabelDisplayNameObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display name observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayNameObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
index d557e74709b..b204c83af18 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayTypeObservableValue.

- */

-public class ColumnFeatureLabelDisplayTypeObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display type observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayTypeObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayTypeObservableValue.
+ */
+public class ColumnFeatureLabelDisplayTypeObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display type observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayTypeObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java
index d74305d7325..748a286c08c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The column observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnIndexHeaderStyleObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnIndexHeaderStyleObservableValue(Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The column observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnIndexHeaderStyleObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnIndexHeaderStyleObservableValue(Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
index 5eb3f5f0db6..1f7853818ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnObjectLabelDisplayIconObservableValue.

- */

-public class ColumnObjectLabelDisplayIconObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column object label display icon observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnObjectLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnObjectLabelDisplayIconObservableValue.
+ */
+public class ColumnObjectLabelDisplayIconObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column object label display icon observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnObjectLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
index c1c1576f1b0..86b7218f726 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnObjectLabelDisplayLabelObservableValue.

- */

-public class ColumnObjectLabelDisplayLabelObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column object label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnObjectLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnObjectLabelDisplayLabelObservableValue.
+ */
+public class ColumnObjectLabelDisplayLabelObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column object label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnObjectLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java
index 6a432b6390c..7e4019b3586 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for Paste EObject containment configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteEObjectContainmentFeatureObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnPasteEObjectContainmentFeatureObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEReference();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for Paste EObject containment configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteEObjectContainmentFeatureObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnPasteEObjectContainmentFeatureObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEReference();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java
index 0a6c2623c2d..79a94cb9bd8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for ElementType Id for the Paste EObject on column

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteEObjectElementTypeIdObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column paste e object element type id observable value.

-	 *

-	 * @param table

-	 *            the table manager

-	 */

-	public ColumnPasteEObjectElementTypeIdObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEString();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for ElementType Id for the Paste EObject on column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteEObjectElementTypeIdObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column paste e object element type id observable value.
+	 *
+	 * @param table
+	 *            the table manager
+	 */
+	public ColumnPasteEObjectElementTypeIdObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEString();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java
index 7a2e807ed80..6d92645e419 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteObjectDetachedModeObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnPasteObjectDetachedModeObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteObjectDetachedModeObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnPasteObjectDetachedModeObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java
index 54d461165f5..ac3468d4f26 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {

-		super(domain, table, true);

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {
+		super(domain, table, true);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java
index e5a8d3e0b62..bfade6e4be6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The row observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayIndexHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the managed table

-	 */

-	public RowDisplayIndexHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The row observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayIndexHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the managed table
+	 */
+	public RowDisplayIndexHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java
index aeb09490f52..b0027c6b10e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The row observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowDisplayLabelHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The row observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowDisplayLabelHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java
index f5f993023ec..66c6ce13a4a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The Class RowFeatureLabelDisplayIconObservableValue.

- *

- * @author Vincent Lorenzo

- */

-public class RowFeatureLabelDisplayIconObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * Gets the value type.

-	 *

-	 * @return the value type

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The Class RowFeatureLabelDisplayIconObservableValue.
+ *
+ * @author Vincent Lorenzo
+ */
+public class RowFeatureLabelDisplayIconObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * Gets the value type.
+	 *
+	 * @return the value type
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java
index ffd5ff1668d..63b5bcd87e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayIsDerivedObservableValue.

- */

-public class RowFeatureLabelDisplayIsDerivedObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display is derived observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayIsDerivedObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayIsDerivedObservableValue.
+ */
+public class RowFeatureLabelDisplayIsDerivedObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display is derived observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayIsDerivedObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java
index 253796a94ee..56bfa1a7d58 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayLabelObservableValue.

- */

-public class RowFeatureLabelDisplayLabelObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayLabelObservableValue.
+ */
+public class RowFeatureLabelDisplayLabelObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java
index 89bc34e9050..4a917e35893 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayMultiplicityObservableValue.

- */

-public class RowFeatureLabelDisplayMultiplicityObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display multiplicity observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayMultiplicityObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayMultiplicityObservableValue.
+ */
+public class RowFeatureLabelDisplayMultiplicityObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display multiplicity observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayMultiplicityObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java
index bb2fb68df0f..84f8744637d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayNameObservableValue.

- */

-public class RowFeatureLabelDisplayNameObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display name observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayNameObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayNameObservableValue.
+ */
+public class RowFeatureLabelDisplayNameObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display name observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayNameObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java
index 63c1f9d7fc2..4dbfcc6b53e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayTypeObservableValue.

- */

-public class RowFeatureLabelDisplayTypeObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display type observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayTypeObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayTypeObservableValue.
+ */
+public class RowFeatureLabelDisplayTypeObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display type observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayTypeObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java
index a0deb2603af..d04db27b2b5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The row observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowIndexHeaderStyleObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowIndexHeaderStyleObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The row observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowIndexHeaderStyleObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowIndexHeaderStyleObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java
index 51a3ea9a1cf..7c7f5aacffd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowObjectLabelDisplayIconObservableValue.

- */

-public class RowObjectLabelDisplayIconObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row object label display icon observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowObjectLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowObjectLabelDisplayIconObservableValue.
+ */
+public class RowObjectLabelDisplayIconObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row object label display icon observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowObjectLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java
index c57964b47e8..3918bea0a2f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowObjectLabelDisplayLabelObservableValue.

- */

-public class RowObjectLabelDisplayLabelObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row object label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowObjectLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowObjectLabelDisplayLabelObservableValue.
+ */
+public class RowObjectLabelDisplayLabelObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row object label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowObjectLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java
index 27c02bc77c3..309950dbb72 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the containment feature for the EObject Paste on Row.

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteEObjectContainmentFeatureObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteEObjectContainmentFeatureObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEReference();

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the containment feature for the EObject Paste on Row.
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteEObjectContainmentFeatureObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteEObjectContainmentFeatureObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEReference();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java
index f5ef191fd27..dc370c50c6d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteEObjectElementTypeIdObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteEObjectElementTypeIdObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEString();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteEObjectElementTypeIdObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteEObjectElementTypeIdObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEString();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java
index 509aacc66dc..fba0958b6a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteObjectDetachedModeObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteObjectDetachedModeObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteObjectDetachedModeObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteObjectDetachedModeObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java
index e86392c3fc8..d04d944c01c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {

-		super(domain, table, false);

-	}

-}

+/*****************************************************************************
+ * 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.properties.observable;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {
+		super(domain, table, false);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java
index 011e8284710..111a875b503 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * 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.properties.provider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-

-public class ColumnPostActionIdsProvider extends AbstractPostActionIdsProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 */

-	public ColumnPostActionIdsProvider(INattableModelManager tableManager) {

-		super(tableManager, true);

-	}

-

-

-}

+/*****************************************************************************
+ * 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.properties.provider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+
+public class ColumnPostActionIdsProvider extends AbstractPostActionIdsProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 */
+	public ColumnPostActionIdsProvider(INattableModelManager tableManager) {
+		super(tableManager, true);
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java
index fe2315b7ce0..a445a194033 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.properties.provider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPostActionIdsProvider extends AbstractPostActionIdsProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 */

-	public RowPostActionIdsProvider(final INattableModelManager tableManager) {

-		super(tableManager, false);

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.properties.provider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPostActionIdsProvider extends AbstractPostActionIdsProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 */
+	public RowPostActionIdsProvider(final INattableModelManager tableManager) {
+		super(tableManager, false);
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
index 2b149270c9c..5c1f9a32c36 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.views.config,

- org.eclipse.papyrus.infra.nattable.views.config.celleditor,

- org.eclipse.papyrus.infra.nattable.views.config.manager.axis,

- org.eclipse.papyrus.infra.nattable.views.config.manager.cell,

- org.eclipse.papyrus.infra.nattable.views.config.messages,

- org.eclipse.papyrus.infra.nattable.views.config.provider,

- org.eclipse.papyrus.infra.nattable.views.config.utils

-Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 4.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.config;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.views.config,
+ org.eclipse.papyrus.infra.nattable.views.config.celleditor,
+ org.eclipse.papyrus.infra.nattable.views.config.manager.axis,
+ org.eclipse.papyrus.infra.nattable.views.config.manager.cell,
+ org.eclipse.papyrus.infra.nattable.views.config.messages,
+ org.eclipse.papyrus.infra.nattable.views.config.provider,
+ org.eclipse.papyrus.infra.nattable.views.config.utils
+Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 4.0.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.config;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
index b3f0d6c462e..3cee8a3a215 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.views.editor.config

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.views.editor.config
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Views Config
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html
@@ -1,28 +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>

+<!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/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties
index 5d4530103a8..91fc6f2f822 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties
@@ -1,10 +1,10 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               icons/,\

-               resources/,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html,\
+               icons/,\
+               resources/,\
+               plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
index f6278f2e113..ee7a09df5c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.views.config</artifactId>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.views.config</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
index 5547b125b82..9c25b5d989e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
@@ -1,19 +1,19 @@
-<?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:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" 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:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table lists all pages (editors) which have the same context than the table of views (or children of the context)" name="TableOfViews" type="PapyrusViewsTable" iconPath="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.infra.nattable.views.config.creation.tester"/>

-  <rowHeaderAxisConfiguration indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.pagelist.contents.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.page.view.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the features of the views" name="Papyrus Views feature provider">

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/name"/>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/context"/>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/isOpen"/>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/type"/>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider"/>

-</nattableconfiguration:TableConfiguration>

+<?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:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" 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:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table lists all pages (editors) which have the same context than the table of views (or children of the context)" name="TableOfViews" type="PapyrusViewsTable" iconPath="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
+  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.infra.nattable.views.config.creation.tester"/>
+  <rowHeaderAxisConfiguration indexStyle="NUMERIC">
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
+    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.pagelist.contents.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
+  </rowHeaderAxisConfiguration>
+  <columnHeaderAxisConfiguration>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>
+    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.page.view.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider"/>
+  </columnHeaderAxisConfiguration>
+  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the features of the views" name="Papyrus Views feature provider">
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/name"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/context"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/isOpen"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/type"/>
+  </columnAxisProviders>
+  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider"/>
+</nattableconfiguration:TableConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
index 9f31c184429..78fe58e4d6a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.views.config;

-

-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.infra.nattable.views.config"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * 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.views.config;
+
+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.infra.nattable.views.config"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	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/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
index 712fa8ff4d5..65a0f9f9071 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * 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.views.config.celleditor;

-

-import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-

-

-/**

- * The cell editor configuration for the table model views

- *

- * @author Vincent Lorenzo

- *

- */

-public class ModelViewsCellEditorConfiguration extends EStructuralFeatureEditorConfig {

-

-	public static final String CONFIG_EDITOR_ID = "MODEL_VIEW_CELL_EDITOR_ID";

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#getFeatureIdentifier(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	protected int getFeatureIdentifier(Table table, Object axisElement) {

-		axisElement = AxisUtils.getRepresentedElement(axisElement);

-		if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_CONTEXT)) {

-			return SINGLE_EMF_REFERENCE;

-		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_IS_OPEN)) {

-			return SINGLE_BOOLEAN;

-		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_NAME)) {

-			return SINGLE_STRING;

-		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_EDITOR_TYPE)) {

-			return SINGLE_STRING;

-		}

-		return UNKNOWN_TYPE;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		axisElement = AxisUtils.getRepresentedElement(axisElement);

-		if (table.getTableConfiguration().getType().equals(Utils.TABLE_VIEW_TYPE_VALUE)) {

-			return axisElement instanceof String && ((String) axisElement).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);

-		}

-		return false;

-	}

-

-	@Override

-	public String getEditorConfigId() {

-		return CONFIG_EDITOR_ID;

-	}

-}

+/*****************************************************************************
+ * 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.views.config.celleditor;
+
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;
+
+
+/**
+ * The cell editor configuration for the table model views
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ModelViewsCellEditorConfiguration extends EStructuralFeatureEditorConfig {
+
+	public static final String CONFIG_EDITOR_ID = "MODEL_VIEW_CELL_EDITOR_ID";
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#getFeatureIdentifier(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	protected int getFeatureIdentifier(Table table, Object axisElement) {
+		axisElement = AxisUtils.getRepresentedElement(axisElement);
+		if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_CONTEXT)) {
+			return SINGLE_EMF_REFERENCE;
+		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_IS_OPEN)) {
+			return SINGLE_BOOLEAN;
+		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_NAME)) {
+			return SINGLE_STRING;
+		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_EDITOR_TYPE)) {
+			return SINGLE_STRING;
+		}
+		return UNKNOWN_TYPE;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public boolean handles(Table table, Object axisElement) {
+		axisElement = AxisUtils.getRepresentedElement(axisElement);
+		if (table.getTableConfiguration().getType().equals(Utils.TABLE_VIEW_TYPE_VALUE)) {
+			return axisElement instanceof String && ((String) axisElement).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);
+		}
+		return false;
+	}
+
+	@Override
+	public String getEditorConfigId() {
+		return CONFIG_EDITOR_ID;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
index 11b4ef0ed48..93c6b28f1d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
@@ -1,276 +1,276 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.emf.adapters.ResourceSetRootsAdapter;

-import org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class EditorContextSynchronizerAxisManager extends AbstractSynchronizedOnEStructuralFeatureAxisManager {

-

-	private IPageManager pageManager;

-

-	private ModelSet modelSet;

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#addContextFeatureValueListener()

-	 *

-	 */

-	@Override

-	protected void addContextFeatureValueListener() {

-		this.featureListener = new ResourceSetRootsAdapter() {

-

-			@Override

-			protected void doNotify(Notification msg) {

-				switch (msg.getEventType()) {

-				case Notification.ADD:

-				case Notification.ADD_MANY:

-				case Notification.REMOVE:

-				case Notification.REMOVE_MANY:

-					featureValueHasChanged(msg);

-				}

-			}

-		};

-

-		try {

-			modelSet = ServiceUtilsForEObject.getInstance().getModelSet(getTableManager().getTable());

-			this.featureListener.setTarget(modelSet);

-			// modelSet.eAdapters().add(this.featureListener);

-		} catch (Exception ex) {

-			Activator.log.error("An error occurred when trying to install a listener on the available pages", ex);

-		}

-	}

-

-	@Override

-	protected void removeListeners() {

-		if (modelSet != null && featureListener != null) {

-			((ResourceSetRootsAdapter) featureListener).unsetTarget(modelSet);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#getFeaturesValue()

-	 *

-	 * @return

-	 */

-	@Override

-	protected List<Object> getFeaturesValue() {

-		if (pageManager == null) {

-			try {

-				pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, getTableManager().getTable());

-			} catch (Exception ex) {

-				Activator.log.error("The page manager is not accessible", ex);

-				return Collections.emptyList();

-			}

-		}

-		return new LinkedList<Object>(pageManager.allPages());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#verifyValues()

-	 *

-	 */

-	@Override

-	protected void verifyValues() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		if (object instanceof PageRef) {

-			return mustBeDisplayedInThisTable(((PageRef) object).getPageIdentifier());

-		}

-		return mustBeDisplayedInThisTable(object);

-	}

-

-	/**

-	 *

-	 * @param page

-	 *            a page

-	 * @return

-	 *         <code>true</code> if the page is referenced by a child of the context of the table or by the context itself

-	 */

-	private boolean mustBeDisplayedInThisTable(final Object page) {

-		final Object value = Utils.getEditorContext(page);

-		if (value instanceof EObject) {

-			final EObject tableContext = getTableContext();

-			EObject container = (EObject) value;

-			while (container != null) {

-				if (container == tableContext) {

-					return true;

-				}

-				container = container.eContainer();

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		this.pageManager = null;

-		super.dispose();

-		this.modelSet = null;

-		this.featureListener = null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @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#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)

-	 *

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            update the list of the managed objects if its required

-	 */

-	@Override

-	protected void featureValueHasChanged(final Notification notification) {

-		if (notification.isTouch()) {

-			return;

-		}

-

-		int eventType = notification.getEventType();

-		List<Object> toAdd = new ArrayList<Object>();

-		List<Object> toRemove = new ArrayList<Object>();

-		switch (eventType) {

-		case Notification.REMOVING_ADAPTER:

-			break;// nothing to do

-		case Notification.ADD:

-			Object newValue = notification.getNewValue();

-			if (newValue instanceof PageRef) {

-				newValue = ((PageRef) newValue).getPageIdentifier();

-			}

-			if (isAllowedContents(newValue)) {

-				toAdd.add(newValue);

-			}

-			break;

-		case Notification.ADD_MANY:

-			Collection<?> newValues = (Collection<?>) notification.getNewValue();

-			for (Object current : newValues) {

-				if (current instanceof PageRef) {

-					current = ((PageRef) current).getPageIdentifier();

-				}

-				if (isAllowedContents(current)) {

-					toAdd.add(current);

-				}

-			}

-			break;

-		case Notification.EVENT_TYPE_COUNT:

-			break;

-		case Notification.MOVE:

-			// we ignore it

-			break;

-		case Notification.REMOVE:

-			Object oldValue = notification.getOldValue();

-			if (oldValue instanceof PageRef) {

-				oldValue = ((PageRef) oldValue).getPageIdentifier();

-			}

-			if (this.managedObject.contains(oldValue)) {

-				toRemove.add(oldValue);

-			}

-			break;

-		case Notification.REMOVE_MANY:

-			Collection<?> oldValues = (Collection<?>) notification.getOldValue();

-			for (Object current : oldValues) {

-				if (current instanceof PageRef) {

-					current = ((PageRef) current).getPageIdentifier();

-				}

-				if (this.managedObject.contains(current)) {

-					toRemove.add(current);

-				}

-			}

-			break;

-		case Notification.RESOLVE:

-		case Notification.SET:

-		case Notification.UNSET:

-			// case Notification.NO_FEATURE_ID:

-			// case Notification.NO_INDEX:

-

-		default:

-			break;

-		}

-		if (toAdd.size() > 0 || toRemove.size() > 0) {

-			updateManagedList(toAdd, toRemove);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.adapters.ResourceSetRootsAdapter;
+import org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.views.config.Activator;
+import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class EditorContextSynchronizerAxisManager extends AbstractSynchronizedOnEStructuralFeatureAxisManager {
+
+	private IPageManager pageManager;
+
+	private ModelSet modelSet;
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#addContextFeatureValueListener()
+	 *
+	 */
+	@Override
+	protected void addContextFeatureValueListener() {
+		this.featureListener = new ResourceSetRootsAdapter() {
+
+			@Override
+			protected void doNotify(Notification msg) {
+				switch (msg.getEventType()) {
+				case Notification.ADD:
+				case Notification.ADD_MANY:
+				case Notification.REMOVE:
+				case Notification.REMOVE_MANY:
+					featureValueHasChanged(msg);
+				}
+			}
+		};
+
+		try {
+			modelSet = ServiceUtilsForEObject.getInstance().getModelSet(getTableManager().getTable());
+			this.featureListener.setTarget(modelSet);
+			// modelSet.eAdapters().add(this.featureListener);
+		} catch (Exception ex) {
+			Activator.log.error("An error occurred when trying to install a listener on the available pages", ex);
+		}
+	}
+
+	@Override
+	protected void removeListeners() {
+		if (modelSet != null && featureListener != null) {
+			((ResourceSetRootsAdapter) featureListener).unsetTarget(modelSet);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#getFeaturesValue()
+	 *
+	 * @return
+	 */
+	@Override
+	protected List<Object> getFeaturesValue() {
+		if (pageManager == null) {
+			try {
+				pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, getTableManager().getTable());
+			} catch (Exception ex) {
+				Activator.log.error("The page manager is not accessible", ex);
+				return Collections.emptyList();
+			}
+		}
+		return new LinkedList<Object>(pageManager.allPages());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#verifyValues()
+	 *
+	 */
+	@Override
+	protected void verifyValues() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAllowedContents(Object object) {
+		if (object instanceof PageRef) {
+			return mustBeDisplayedInThisTable(((PageRef) object).getPageIdentifier());
+		}
+		return mustBeDisplayedInThisTable(object);
+	}
+
+	/**
+	 *
+	 * @param page
+	 *            a page
+	 * @return
+	 *         <code>true</code> if the page is referenced by a child of the context of the table or by the context itself
+	 */
+	private boolean mustBeDisplayedInThisTable(final Object page) {
+		final Object value = Utils.getEditorContext(page);
+		if (value instanceof EObject) {
+			final EObject tableContext = getTableContext();
+			EObject container = (EObject) value;
+			while (container != null) {
+				if (container == tableContext) {
+					return true;
+				}
+				container = container.eContainer();
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		this.pageManager = null;
+		super.dispose();
+		this.modelSet = null;
+		this.featureListener = null;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @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#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)
+	 *
+	 * @param domain
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            update the list of the managed objects if its required
+	 */
+	@Override
+	protected void featureValueHasChanged(final Notification notification) {
+		if (notification.isTouch()) {
+			return;
+		}
+
+		int eventType = notification.getEventType();
+		List<Object> toAdd = new ArrayList<Object>();
+		List<Object> toRemove = new ArrayList<Object>();
+		switch (eventType) {
+		case Notification.REMOVING_ADAPTER:
+			break;// nothing to do
+		case Notification.ADD:
+			Object newValue = notification.getNewValue();
+			if (newValue instanceof PageRef) {
+				newValue = ((PageRef) newValue).getPageIdentifier();
+			}
+			if (isAllowedContents(newValue)) {
+				toAdd.add(newValue);
+			}
+			break;
+		case Notification.ADD_MANY:
+			Collection<?> newValues = (Collection<?>) notification.getNewValue();
+			for (Object current : newValues) {
+				if (current instanceof PageRef) {
+					current = ((PageRef) current).getPageIdentifier();
+				}
+				if (isAllowedContents(current)) {
+					toAdd.add(current);
+				}
+			}
+			break;
+		case Notification.EVENT_TYPE_COUNT:
+			break;
+		case Notification.MOVE:
+			// we ignore it
+			break;
+		case Notification.REMOVE:
+			Object oldValue = notification.getOldValue();
+			if (oldValue instanceof PageRef) {
+				oldValue = ((PageRef) oldValue).getPageIdentifier();
+			}
+			if (this.managedObject.contains(oldValue)) {
+				toRemove.add(oldValue);
+			}
+			break;
+		case Notification.REMOVE_MANY:
+			Collection<?> oldValues = (Collection<?>) notification.getOldValue();
+			for (Object current : oldValues) {
+				if (current instanceof PageRef) {
+					current = ((PageRef) current).getPageIdentifier();
+				}
+				if (this.managedObject.contains(current)) {
+					toRemove.add(current);
+				}
+			}
+			break;
+		case Notification.RESOLVE:
+		case Notification.SET:
+		case Notification.UNSET:
+			// case Notification.NO_FEATURE_ID:
+			// case Notification.NO_INDEX:
+
+		default:
+			break;
+		}
+		if (toAdd.size() > 0 || toRemove.size() > 0) {
+			updateManagedList(toAdd, toRemove);
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
index 9fb1916112b..2a37e6bfb61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * 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.views.config.manager.axis;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;

-

-/**

- * The feature axis content provider for the ModelViews table

- *

- * @author Vincent Lorenzo

- *

- */

-public class EditorFeatureAxisManager extends AbstractAxisManager {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ISubAxisManager#isDynamic()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isDynamic() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isSlave() {

-		return true;

-	}

-

-	/**

-	 *

-	 * @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.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#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)

-	 *

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	@Override

-	public boolean canBeSavedAsConfig() {

-		return true;

-	}

-}

+/*****************************************************************************
+ * 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.views.config.manager.axis;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;
+
+/**
+ * The feature axis content provider for the ModelViews table
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class EditorFeatureAxisManager extends AbstractAxisManager {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ISubAxisManager#isDynamic()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isDynamic() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isSlave() {
+		return true;
+	}
+
+	/**
+	 *
+	 * @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.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#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)
+	 *
+	 * @param domain
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	@Override
+	public boolean canBeSavedAsConfig() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
index 3bad559b5a9..8d299cd86b3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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

- *   Christian W. Damus - bug 485220

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.views.config.messages.messages"; //$NON-NLS-1$

-

-	public static String TableViewCreationTester_TheTableViewCanBeCreated;

-

-	public static String TableViewCreationTester_TheTableViewCantBeCreated;

-

-	public static String TableViewCreationTester_ServicesUnavailable;

-

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.views.config.messages.messages"; //$NON-NLS-1$
+
+	public static String TableViewCreationTester_TheTableViewCanBeCreated;
+
+	public static String TableViewCreationTester_TheTableViewCantBeCreated;
+
+	public static String TableViewCreationTester_ServicesUnavailable;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
index 9ba9e62e2c1..1655cc65954 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
@@ -1,15 +1,15 @@
-#

-# Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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

-#   Christian W. Damus - bug 485220

-#

-TableViewCreationTester_TheTableViewCanBeCreated=The table of view can be created

-TableViewCreationTester_TheTableViewCantBeCreated=The table of view can't be created, the context is not an element of the model

-TableViewCreationTester_ServicesUnavailable=The table of view can't be created because the language service is unavailable

+#
+# Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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
+#   Christian W. Damus - bug 485220
+#
+TableViewCreationTester_TheTableViewCanBeCreated=The table of view can be created
+TableViewCreationTester_TheTableViewCantBeCreated=The table of view can't be created, the context is not an element of the model
+TableViewCreationTester_ServicesUnavailable=The table of view can't be created because the language service is unavailable
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
index ac694028e6b..01765bf9094 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
@@ -1,134 +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.views.config.provider;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;

-import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-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.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * The label provider used for ModelView header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(final Object element) {

-		if (element instanceof ILabelProviderContextElementWrapper) {

-			final Object object = ((ILabelProviderContextElementWrapper) element).getObject();

-			final String id = AxisUtils.getPropertyId(object);

-			if (id != null) {

-				return id.startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(final Object element) {

-		final ILabelProviderContextElementWrapper contextElement = (ILabelProviderContextElementWrapper) element;

-		final Object object = contextElement.getObject();

-		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();

-		final String id = AxisUtils.getPropertyId(object);

-		String name = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		Object type = null;

-		boolean isDerived = false;

-		int lowerBounds = 1;

-		int upperBounds = 1;

-		if (Utils.VIEW_NAME.equals(name)) {

-			lowerBounds = 0;

-			type = EcorePackage.eINSTANCE.getEString();

-		} else if (Utils.VIEW_IS_OPEN.equals(name)) {

-			isDerived = true;

-			type = EcorePackage.eINSTANCE.getEBoolean();

-		} else if (Utils.VIEW_CONTEXT.equals(name)) {

-			isDerived = true;

-			type = EcorePackage.eINSTANCE.getEObject();

-		} else if (Utils.VIEW_EDITOR_TYPE.equals(name)) {

-			type = EcorePackage.eINSTANCE.getEString();

-		}

-		ILabelProviderConfiguration conf = null;

-		if (element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);

-		}

-		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {

-			return ""; //$NON-NLS-1$

-		}

-		String alias = ""; //$NON-NLS-1$

-		if (object instanceof FeatureAxis) {

-			alias = ((FeatureAxis) object).getAlias();

-		}

-		if (alias != null && !alias.equals("")) { //$NON-NLS-1$

-			name = alias;

-		}

-		if (conf instanceof FeatureLabelProviderConfiguration) {

-			return getText((FeatureLabelProviderConfiguration) conf, configRegistry, name, type, isDerived, lowerBounds, upperBounds);

-		} else {

-			return super.getText(element);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(final Object element) {

-		ILabelProviderConfiguration conf = null;

-		if (element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);

-		}

-		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayIcon()) {

-			return null;

-		}

-		final Object object = ((ILabelProviderContextElementWrapper) element).getObject();

-		final String id = AxisUtils.getPropertyId(object);

-		final String columnName = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		if (Utils.VIEW_NAME.equals(columnName) || Utils.VIEW_IS_OPEN.equals(columnName) || Utils.VIEW_EDITOR_TYPE.equals(columnName)) {

-			return EStructuralFeatureImageRegistry.getAttributeIcon();

-		} else if (Utils.VIEW_CONTEXT.equals(columnName)) {

-			return EStructuralFeatureImageRegistry.getLinkIcon();

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * 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.views.config.provider;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;
+import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+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.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * The label provider used for ModelView header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean accept(final Object element) {
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			final String id = AxisUtils.getPropertyId(object);
+			if (id != null) {
+				return id.startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public String getText(final Object element) {
+		final ILabelProviderContextElementWrapper contextElement = (ILabelProviderContextElementWrapper) element;
+		final Object object = contextElement.getObject();
+		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();
+		final String id = AxisUtils.getPropertyId(object);
+		String name = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$
+		Object type = null;
+		boolean isDerived = false;
+		int lowerBounds = 1;
+		int upperBounds = 1;
+		if (Utils.VIEW_NAME.equals(name)) {
+			lowerBounds = 0;
+			type = EcorePackage.eINSTANCE.getEString();
+		} else if (Utils.VIEW_IS_OPEN.equals(name)) {
+			isDerived = true;
+			type = EcorePackage.eINSTANCE.getEBoolean();
+		} else if (Utils.VIEW_CONTEXT.equals(name)) {
+			isDerived = true;
+			type = EcorePackage.eINSTANCE.getEObject();
+		} else if (Utils.VIEW_EDITOR_TYPE.equals(name)) {
+			type = EcorePackage.eINSTANCE.getEString();
+		}
+		ILabelProviderConfiguration conf = null;
+		if (element instanceof LabelProviderCellContextElementWrapper) {
+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);
+		}
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {
+			return ""; //$NON-NLS-1$
+		}
+		String alias = ""; //$NON-NLS-1$
+		if (object instanceof FeatureAxis) {
+			alias = ((FeatureAxis) object).getAlias();
+		}
+		if (alias != null && !alias.equals("")) { //$NON-NLS-1$
+			name = alias;
+		}
+		if (conf instanceof FeatureLabelProviderConfiguration) {
+			return getText((FeatureLabelProviderConfiguration) conf, configRegistry, name, type, isDerived, lowerBounds, upperBounds);
+		} else {
+			return super.getText(element);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public Image getImage(final Object element) {
+		ILabelProviderConfiguration conf = null;
+		if (element instanceof LabelProviderCellContextElementWrapper) {
+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);
+		}
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayIcon()) {
+			return null;
+		}
+		final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+		final String id = AxisUtils.getPropertyId(object);
+		final String columnName = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$
+		if (Utils.VIEW_NAME.equals(columnName) || Utils.VIEW_IS_OPEN.equals(columnName) || Utils.VIEW_EDITOR_TYPE.equals(columnName)) {
+			return EStructuralFeatureImageRegistry.getAttributeIcon();
+		} else if (Utils.VIEW_CONTEXT.equals(columnName)) {
+			return EStructuralFeatureImageRegistry.getLinkIcon();
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
index 5cb742e03c3..02681f48d76 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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.views.config.utils;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.language.ILanguageService;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-import org.eclipse.papyrus.infra.nattable.views.config.messages.Messages;

-

-

-public class TableViewCreationTester implements ITableTester {

-

-

-	@Override

-	public IStatus isAllowed(Object context) {

-		if (context instanceof EObject) {

-			final EObject current = (EObject) context;

-

-			try {

-				ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(current);

-				IModel model = modelSet.getModelFor(current);

-				if (model != null) {

-					// This is an element of some model. Is it a semantic model?

-					if (ILanguageService.getLanguageModels(modelSet).contains(model)) {

-						return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCanBeCreated);

-					}

-				}

-			} catch (ServiceException e) {

-				// Okay, no services? Then this isn't an appropriate context

-				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_ServicesUnavailable);

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCantBeCreated);

-	}

-}

+/*****************************************************************************
+ * 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.views.config.utils;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.tester.ITableTester;
+import org.eclipse.papyrus.infra.nattable.views.config.Activator;
+import org.eclipse.papyrus.infra.nattable.views.config.messages.Messages;
+
+
+public class TableViewCreationTester implements ITableTester {
+
+
+	@Override
+	public IStatus isAllowed(Object context) {
+		if (context instanceof EObject) {
+			final EObject current = (EObject) context;
+
+			try {
+				ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(current);
+				IModel model = modelSet.getModelFor(current);
+				if (model != null) {
+					// This is an element of some model. Is it a semantic model?
+					if (ILanguageService.getLanguageModels(modelSet).contains(model)) {
+						return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCanBeCreated);
+					}
+				}
+			} catch (ServiceException e) {
+				// Okay, no services? Then this isn't an appropriate context
+				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_ServicesUnavailable);
+			}
+		}
+		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCantBeCreated);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
index 56eea3be9fa..4fd98ee3a74 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
@@ -1,123 +1,123 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class Utils {

-

-	private Utils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * the prefix used for the editor

-	 */

-	public static final String NATTABLE_EDITOR_PAGE_ID = "nattable_editor_pages:/"; //$NON-NLS-1$

-

-	/**

-	 * the name column

-	 */

-	public static final String VIEW_NAME = "name"; //$NON-NLS-1$

-

-	/**

-	 * the context column

-	 */

-	public static final String VIEW_CONTEXT = "context"; //$NON-NLS-1$

-

-	/**

-	 * the isOpen column

-	 */

-	public static final String VIEW_IS_OPEN = "isOpen"; //$NON-NLS-1$

-

-	/**

-	 * the type column

-	 */

-	public static final String VIEW_EDITOR_TYPE = "type"; //$NON-NLS-1$

-

-	/**

-	 * the type of the table views

-	 */

-	public static final String TABLE_VIEW_TYPE_VALUE = "PapyrusViewsTable";

-

-	/**

-	 * the name of the feature which references the context of a diagram

-	 */

-	private static final String DIAGRAM_CONTEXT_FEATURE_NAME = "element"; //$NON-NLS-1$

-

-	/**

-	 * the name of the feature which references the EMF-Facet table in the PapyrusTableInstance

-	 */

-	private static final String PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME = "table"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @param eobject

-	 *            an eobject

-	 * @return

-	 * 		the IPageMngr found thanks to this eobject or <code>null</code> if not found

-	 */

-	public static final IPageManager getIPagneManager(final EObject eobject) {

-		IPageManager mngr = null;

-		try {

-			mngr = ServiceUtilsForResource.getInstance().getService(IPageManager.class, eobject.eResource());

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return mngr;

-	}

-

-	/**

-	 *

-	 * @param editor

-	 *            an editor

-	 * @return

-	 * 		the Context of this editor, or <code>null</code> if not found

-	 */

-	public static final Object getEditorContext(final Object editor) {

-		if (editor instanceof EObject) {

-			EObject eobject = (EObject) editor;

-			EStructuralFeature feature = eobject.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);

-			if (feature == null) {// it is maybe a diagram

-				// workaround for the diagram

-				feature = eobject.eClass().getEStructuralFeature(DIAGRAM_CONTEXT_FEATURE_NAME);

-			}

-			if (feature != null) {

-				return eobject.eGet(feature);

-			}

-			// its maybe an old table

-			EStructuralFeature tmp = eobject.eClass().getEStructuralFeature(PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME);

-			if (tmp != null) {

-				final EObject tableinstance2 = (EObject) eobject.eGet(tmp);

-				if (tableinstance2 != null) {

-					feature = tableinstance2.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);

-					return tableinstance2.eGet(feature);

-				}

-

-			}

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.utils;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.nattable.views.config.Activator;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class Utils {
+
+	private Utils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * the prefix used for the editor
+	 */
+	public static final String NATTABLE_EDITOR_PAGE_ID = "nattable_editor_pages:/"; //$NON-NLS-1$
+
+	/**
+	 * the name column
+	 */
+	public static final String VIEW_NAME = "name"; //$NON-NLS-1$
+
+	/**
+	 * the context column
+	 */
+	public static final String VIEW_CONTEXT = "context"; //$NON-NLS-1$
+
+	/**
+	 * the isOpen column
+	 */
+	public static final String VIEW_IS_OPEN = "isOpen"; //$NON-NLS-1$
+
+	/**
+	 * the type column
+	 */
+	public static final String VIEW_EDITOR_TYPE = "type"; //$NON-NLS-1$
+
+	/**
+	 * the type of the table views
+	 */
+	public static final String TABLE_VIEW_TYPE_VALUE = "PapyrusViewsTable";
+
+	/**
+	 * the name of the feature which references the context of a diagram
+	 */
+	private static final String DIAGRAM_CONTEXT_FEATURE_NAME = "element"; //$NON-NLS-1$
+
+	/**
+	 * the name of the feature which references the EMF-Facet table in the PapyrusTableInstance
+	 */
+	private static final String PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME = "table"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * @param eobject
+	 *            an eobject
+	 * @return
+	 * 		the IPageMngr found thanks to this eobject or <code>null</code> if not found
+	 */
+	public static final IPageManager getIPagneManager(final EObject eobject) {
+		IPageManager mngr = null;
+		try {
+			mngr = ServiceUtilsForResource.getInstance().getService(IPageManager.class, eobject.eResource());
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		return mngr;
+	}
+
+	/**
+	 *
+	 * @param editor
+	 *            an editor
+	 * @return
+	 * 		the Context of this editor, or <code>null</code> if not found
+	 */
+	public static final Object getEditorContext(final Object editor) {
+		if (editor instanceof EObject) {
+			EObject eobject = (EObject) editor;
+			EStructuralFeature feature = eobject.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);
+			if (feature == null) {// it is maybe a diagram
+				// workaround for the diagram
+				feature = eobject.eClass().getEStructuralFeature(DIAGRAM_CONTEXT_FEATURE_NAME);
+			}
+			if (feature != null) {
+				return eobject.eGet(feature);
+			}
+			// its maybe an old table
+			EStructuralFeature tmp = eobject.eClass().getEStructuralFeature(PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME);
+			if (tmp != null) {
+				final EObject tableinstance2 = (EObject) eobject.eGet(tmp);
+				if (tableinstance2 != null) {
+					feature = tableinstance2.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);
+					return tableinstance2.eGet(feature);
+				}
+
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath
index 78d5ded0fee..bc74aabe31c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath
@@ -1,6 +1,6 @@
-<?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.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
index 78f65a51ec7..a332c5e4ab8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.page.editor

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.page.editor
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Page Nattable Editor
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html
@@ -1,28 +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>

+<!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/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
index 06a68a75716..ab26669ed30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
@@ -1,7 +1,7 @@
-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html,\

-               icons/,

-src.includes = about.html

+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/,\
+               about.html,\
+               icons/,
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
index 64e206fa600..7346dfd1a98 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

- <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a new Views Table"

-            id="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-            name="Create a new Views Table">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a new Views Table Without dialog"

-            id="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"

-            name="Create a new Views Table ">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusViewsTable">

-            </parameter>

-         </class>

-      </handler>

-      <handler

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorWithoutDialogHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusViewsTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-            icon="icons/nattablepageeditor_new.png">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"

-            icon="icons/nattablepageeditor_new.png">

-      </image>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Create a new Views Table"
+            id="org.eclipse.papyrus.infra.nattable.page.editor.create.command"
+            name="Create a new Views Table">
+      </command>
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Create a new Views Table Without dialog"
+            id="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"
+            name="Create a new Views Table ">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command">
+         <activeWhen>
+            <or>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </or>
+         </activeWhen>
+         <class
+               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">
+            <parameter
+                  name="tableType"
+                  value="PapyrusViewsTable">
+            </parameter>
+         </class>
+      </handler>
+      <handler
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command">
+         <activeWhen>
+            <or>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </or>
+         </activeWhen>
+         <class
+               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorWithoutDialogHandler">
+            <parameter
+                  name="tableType"
+                  value="PapyrusViewsTable">
+            </parameter>
+         </class>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commandImages">
+      <image
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"
+            icon="icons/nattablepageeditor_new.png">
+      </image>
+      <image
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"
+            icon="icons/nattablepageeditor_new.png">
+      </image>
+   </extension>
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.6

-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

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+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/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
index cfaa4dcc2a6..a27f72ea682 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Common Plugin for Papyrus Table
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
index 5bbead8ef1f..2b5e0087a47 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
@@ -1,12 +1,12 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               icons/,\

-               about.html,\

-               OSGI-INF/,\

-               schema/,\

-               model/

-src.includes = about.html,\

-               model/

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/,\
+               about.html,\
+               OSGI-INF/,\
+               schema/,\
+               model/
+src.includes = about.html,\
+               model/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
index 41aad4ec74f..9ae10dbca06 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" name="TableContents" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" name="TableContents" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
index 9a551c408c9..1a7c0729eda 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" name="TableContext" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" name="TableContext" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
index 5dd209ae581..71dc3066c36 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
@@ -1,129 +1,129 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.nattable" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.nattable" id="org.eclipse.papyrus.infra.nattable.tester" name="Table Tester"/>

-      </appinfo>

-      <documentation>

-         This extension point allows to register tester object used in the table. These testers are referenced by the Papyrus table metamodel using an unique id.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="tester"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="tester">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.tester.ITableTester"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         MDT papyrus 0.10.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         See Papyrus nattable plugins

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*****************************************************************************

- * 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

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.nattable" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.nattable" id="org.eclipse.papyrus.infra.nattable.tester" name="Table Tester"/>
+      </appinfo>
+      <documentation>
+         This extension point allows to register tester object used in the table. These testers are referenced by the Papyrus table metamodel using an unique id.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="tester"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="tester">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.tester.ITableTester"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         MDT papyrus 0.10.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         See Papyrus nattable plugins
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         none
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         none
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         /*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
index 9d449e2b73c..4035589452d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.papyrus.infra.nattable.preferences.PapyrusTablePreferenceStore;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * Storage for preferences.

-	 */

-	protected IPreferenceStore papyrusPreferenceStore;

-

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	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;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()

-	 *

-	 * @return

-	 */

-	@Override

-	public IPreferenceStore getPreferenceStore() {

-		// Create the preference store lazily.

-		if (this.papyrusPreferenceStore == null) {

-			this.papyrusPreferenceStore = new PapyrusTablePreferenceStore(new InstanceScope(), getBundle().getSymbolicName());

-		}

-		return this.papyrusPreferenceStore;

-	}

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.nattable.preferences.PapyrusTablePreferenceStore;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * Storage for preferences.
+	 */
+	protected IPreferenceStore papyrusPreferenceStore;
+
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	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;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
+	 *
+	 * @return
+	 */
+	@Override
+	public IPreferenceStore getPreferenceStore() {
+		// Create the preference store lazily.
+		if (this.papyrusPreferenceStore == null) {
+			this.papyrusPreferenceStore = new PapyrusTablePreferenceStore(new InstanceScope(), getBundle().getSymbolicName());
+		}
+		return this.papyrusPreferenceStore;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
index fe56ce48ea5..31918c3e605 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * 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.accumulator;

-

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.AbstractOverrider;

-

-/**

- *

- * This accumulator is used to register CellEditor on rows

- *

- */

-public class CustomRowOverrideLabelAccumulator extends AbstractOverrider {

-

-	private final ILayer layer;

-

-	public CustomRowOverrideLabelAccumulator(ILayer layer) {

-		this.layer = layer;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.IConfigLabelAccumulator#accumulateConfigLabels(org.eclipse.nebula.widgets.nattable.layer.LabelStack, int, int)

-	 *

-	 * @param configLabels

-	 * @param columnPosition

-	 * @param rowPosition

-	 */

-	@Override

-	public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {

-		int rowIndex = layer.getRowIndexByPosition(rowPosition);

-		List<String> overrides = getOverrides(Integer.valueOf(rowIndex));

-		if (overrides != null) {

-			for (String configLabel : overrides) {

-				configLabels.addLabel(configLabel);

-			}

-		}

-	}

-

-	/**

-	 * Register labels to be contributed a column. This label will be applied to<br/>

-	 * all cells in the column.

-	 */

-	public void registerRowOverrides(int rowIndex, String... configLabels) {

-		super.registerOverrides(Integer.valueOf(rowIndex), configLabels);

-	}

-

-	/**

-	 * Register labels to be contributed a column. This label will be applied to<br/>

-	 * all cells in the column.

-	 */

-	public void registerRowOverridesOnTop(int rowIndex, String... configLabels) {

-		super.registerOverridesOnTop(Integer.valueOf(rowIndex), configLabels);

-	}

-

-}

+/*****************************************************************************
+ * 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.accumulator;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.cell.AbstractOverrider;
+
+/**
+ *
+ * This accumulator is used to register CellEditor on rows
+ *
+ */
+public class CustomRowOverrideLabelAccumulator extends AbstractOverrider {
+
+	private final ILayer layer;
+
+	public CustomRowOverrideLabelAccumulator(ILayer layer) {
+		this.layer = layer;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.IConfigLabelAccumulator#accumulateConfigLabels(org.eclipse.nebula.widgets.nattable.layer.LabelStack, int, int)
+	 *
+	 * @param configLabels
+	 * @param columnPosition
+	 * @param rowPosition
+	 */
+	@Override
+	public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {
+		int rowIndex = layer.getRowIndexByPosition(rowPosition);
+		List<String> overrides = getOverrides(Integer.valueOf(rowIndex));
+		if (overrides != null) {
+			for (String configLabel : overrides) {
+				configLabels.addLabel(configLabel);
+			}
+		}
+	}
+
+	/**
+	 * Register labels to be contributed a column. This label will be applied to<br/>
+	 * all cells in the column.
+	 */
+	public void registerRowOverrides(int rowIndex, String... configLabels) {
+		super.registerOverrides(Integer.valueOf(rowIndex), configLabels);
+	}
+
+	/**
+	 * Register labels to be contributed a column. This label will be applied to<br/>
+	 * all cells in the column.
+	 */
+	public void registerRowOverridesOnTop(int rowIndex, String... configLabels) {
+		super.registerOverridesOnTop(Integer.valueOf(rowIndex), configLabels);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
index 2ee302e19fb..ad89427edfd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.advice;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;

-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.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-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.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * Destroy the NatTable

- *

- *

- * @author Vincent Lorenzo

- *

- */

-public class DeleteNatTableContextAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-		final EObject objectToDestroy = request.getElementToDestroy();

-		if (objectToDestroy == null) {

-			return null;

-		}

-

-		final ECrossReferenceAdapter crossReferencerAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(objectToDestroy);

-		if (crossReferencerAdapter != null) {

-			final Collection<Setting> settings = crossReferencerAdapter.getNonNavigableInverseReferences(objectToDestroy);

-			CompositeCommand cmd = new CompositeCommand(Messages.DeleteNatTableContextAdvice_DestroyNattableCommand);

-			for (Setting currentSetting : settings) {

-				final EObject currentEObject = currentSetting.getEObject();

-				final EStructuralFeature currentfeature = currentSetting.getEStructuralFeature();

-				if (currentEObject instanceof Table && currentfeature == NattablePackage.eINSTANCE.getTable_Context()) {

-					final DestroyElementRequest request2 = new DestroyElementRequest(currentEObject, false);

-					final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(currentEObject);

-					cmd.add(provider.getEditCommand(request2));

-				}

-			}

-			if (!cmd.isEmpty()) {

-				return cmd;

-			}

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.advice;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+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.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+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.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * Destroy the NatTable
+ *
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class DeleteNatTableContextAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
+		final EObject objectToDestroy = request.getElementToDestroy();
+		if (objectToDestroy == null) {
+			return null;
+		}
+
+		final ECrossReferenceAdapter crossReferencerAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(objectToDestroy);
+		if (crossReferencerAdapter != null) {
+			final Collection<Setting> settings = crossReferencerAdapter.getNonNavigableInverseReferences(objectToDestroy);
+			CompositeCommand cmd = new CompositeCommand(Messages.DeleteNatTableContextAdvice_DestroyNattableCommand);
+			for (Setting currentSetting : settings) {
+				final EObject currentEObject = currentSetting.getEObject();
+				final EStructuralFeature currentfeature = currentSetting.getEStructuralFeature();
+				if (currentEObject instanceof Table && currentfeature == NattablePackage.eINSTANCE.getTable_Context()) {
+					final DestroyElementRequest request2 = new DestroyElementRequest(currentEObject, false);
+					final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(currentEObject);
+					cmd.add(provider.getEditCommand(request2));
+				}
+			}
+			if (!cmd.isEmpty()) {
+				return cmd;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
index 1e9deab6d89..b24b778f504 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * 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.celleditor;

-

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.nebula.widgets.nattable.widget.NatCombo;

-

-/**

- *

- * This abstract class is used to declare addition action for a button located near a NatCombo

- *

- */

-public abstract class AbstractComboAction {

-

-	/**

-	 * The NatCombo

-	 */

-	protected NatCombo combo;

-

-	/**

-	 * the column index of the edited cell

-	 */

-	protected int columnIndex;

-

-	/**

-	 * the row index of the edited cell

-	 */

-	protected int rowIndex;

-

-	/**

-	 * The combo box data provider

-	 */

-	protected IComboBoxDataProvider dataProvider;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 *            the data provider used for the combo

-	 */

-	public AbstractComboAction(final IComboBoxDataProvider dataProvider) {

-		this.dataProvider = dataProvider;

-	}

-

-	/**

-	 *

-	 * @param combo

-	 *            the NatCombo

-	 */

-	public void setNatCombo(final NatCombo combo) {

-		this.combo = combo;

-	}

-

-	/**

-	 * This method is called when the button is pressed

-	 */

-	public abstract void run();

-

-

-	/**

-	 * Setter for the edited cell location

-	 *

-	 * @param columnIndex

-	 *            the column index of the edited cell

-	 * @param rowIndex

-	 *            the row index of the edited cell

-	 */

-	public final void setCellLocation(int columnIndex, int rowIndex) {

-		this.columnIndex = columnIndex;

-		this.rowIndex = rowIndex;

-	}

-}

+/*****************************************************************************
+ * 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.celleditor;
+
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
+
+/**
+ *
+ * This abstract class is used to declare addition action for a button located near a NatCombo
+ *
+ */
+public abstract class AbstractComboAction {
+
+	/**
+	 * The NatCombo
+	 */
+	protected NatCombo combo;
+
+	/**
+	 * the column index of the edited cell
+	 */
+	protected int columnIndex;
+
+	/**
+	 * the row index of the edited cell
+	 */
+	protected int rowIndex;
+
+	/**
+	 * The combo box data provider
+	 */
+	protected IComboBoxDataProvider dataProvider;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 *            the data provider used for the combo
+	 */
+	public AbstractComboAction(final IComboBoxDataProvider dataProvider) {
+		this.dataProvider = dataProvider;
+	}
+
+	/**
+	 *
+	 * @param combo
+	 *            the NatCombo
+	 */
+	public void setNatCombo(final NatCombo combo) {
+		this.combo = combo;
+	}
+
+	/**
+	 * This method is called when the button is pressed
+	 */
+	public abstract void run();
+
+
+	/**
+	 * Setter for the edited cell location
+	 *
+	 * @param columnIndex
+	 *            the column index of the edited cell
+	 * @param rowIndex
+	 *            the row index of the edited cell
+	 */
+	public final void setCellLocation(int columnIndex, int rowIndex) {
+		this.columnIndex = columnIndex;
+		this.rowIndex = rowIndex;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
index 1621ddefdc4..945a9b31fec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
@@ -1,225 +1,225 @@
-/*****************************************************************************

- * 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.celleditor;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.window.Window;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.StyledText;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * Abstract Class for StyledText cell editor.

- * This class is used for XText Cell Editor and text editor with completion

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyledTextCellEditor{

-

-	/**

-	 * the table

-	 */

-	protected final Table table;

-

-	/**

-	 * the axis element on which this cell editor is declared

-	 */

-	protected final Object axisElement;

-

-	/**

-	 * the table element provider

-	 */

-	protected final ITableAxisElementProvider elementProvider;

-

-	/**

-	 * the configuration of the additional button

-	 */

-	protected AbstractOpenDialogCellEditorButtonAction buttonConfiguration;

-

-	/**

-	 * the controller of the editor

-	 */

-	private Control editorControl;

-

-	/**

-	 * the initial value

-	 */

-	private Object originalValue;

-

-	/**

-	 * the styled text

-	 */

-	private StyledText text;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 * @param commitOnUpDown

-	 * @param moveSelectionOnEnter

-	 */

-	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown, boolean moveSelectionOnEnter) {

-		super(commitOnUpDown, moveSelectionOnEnter);

-		this.table = table;

-		this.axisElement = axisElement;

-		this.elementProvider = elementProvider;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 */

-	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		this(table, axisElement, elementProvider, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 * @param commitOnUpDown

-	 */

-	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown) {

-		this(table, axisElement, elementProvider, commitOnUpDown, false);

-	}

-

-	/**

-	 *

-	 * @return the edited object

-	 */

-	protected abstract EObject getEditedEObject();

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#activateCell(org.eclipse.swt.widgets.Composite, java.lang.Object)

-	 *

-	 * @param parent

-	 * @param originalCanonicalValue

-	 * @return

-	 */

-	@Override

-	protected Control activateCell(Composite parent, Object originalCanonicalValue) {

-		this.originalValue = originalCanonicalValue;

-		Composite realParent = parent;

-		if (this.buttonConfiguration != null) {

-			realParent = new Composite(parent, SWT.NONE);

-		}

-		this.text = (StyledText) super.activateCell(realParent, originalCanonicalValue);

-		if (this.buttonConfiguration != null) {

-			this.editorControl = realParent;

-			GridLayout gridLayout = new GridLayout(2, false);

-			gridLayout.horizontalSpacing = 0;

-			gridLayout.verticalSpacing = 0;

-			gridLayout.marginHeight = 0;

-			gridLayout.marginWidth = 0;

-			realParent.setLayout(gridLayout);

-

-			GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);

-			text.setLayoutData(gridData);

-

-			Button b = createAdditionalButton(realParent);

-			GridData buttonGridData = new GridData(SWT.RIGHT, SWT.FILL, false, true);

-			b.setLayoutData(buttonGridData);

-			this.buttonConfiguration.setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());

-		} else {

-			this.editorControl = text;

-		}

-		return this.editorControl;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#getEditorControl()

-	 *

-	 * @return

-	 */

-	@Override

-	public Control getEditorControl() {

-		return editorControl;

-	}

-

-	/**

-	 * 

-	 * @param composite

-	 *            the composite parent

-	 * @return

-	 *         the created button

-	 * 

-	 */

-	protected Button createAdditionalButton(Composite composite) {

-		Button button = new Button(composite, SWT.NONE);

-		button.setText(this.buttonConfiguration.getText());

-		button.setToolTipText(this.buttonConfiguration.getTooltipText());

-		button.setImage(this.buttonConfiguration.getImage());

-		button.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				runButtonAction();

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		});

-		return button;

-	}

-

-

-	/**

-	 * execute the action declared in the button

-	 */

-	protected void runButtonAction() {

-		if (Window.OK == this.buttonConfiguration.openDialog(parent, originalValue, layerCell, configRegistry)) {

-			setCanonicalValue(this.buttonConfiguration.getEditorValue());

-			commit(MoveDirectionEnum.NONE);

-		} else {

-			close();

-		}

-	}

-

-	/**

-	 * This method allow to define the behavior of the an additional button located at the right of the text field in the cell

-	 * 

-	 * @param additionalAction

-	 */

-	public void setOpenDialogCellEditorButtonAction(AbstractOpenDialogCellEditorButtonAction additionalAction) {

-		this.buttonConfiguration = additionalAction;

-		if (additionalAction != null) {

-			Assert.isNotNull(additionalAction);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.celleditor;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.window.Window;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Abstract Class for StyledText cell editor.
+ * This class is used for XText Cell Editor and text editor with completion
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyledTextCellEditor{
+
+	/**
+	 * the table
+	 */
+	protected final Table table;
+
+	/**
+	 * the axis element on which this cell editor is declared
+	 */
+	protected final Object axisElement;
+
+	/**
+	 * the table element provider
+	 */
+	protected final ITableAxisElementProvider elementProvider;
+
+	/**
+	 * the configuration of the additional button
+	 */
+	protected AbstractOpenDialogCellEditorButtonAction buttonConfiguration;
+
+	/**
+	 * the controller of the editor
+	 */
+	private Control editorControl;
+
+	/**
+	 * the initial value
+	 */
+	private Object originalValue;
+
+	/**
+	 * the styled text
+	 */
+	private StyledText text;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 * @param commitOnUpDown
+	 * @param moveSelectionOnEnter
+	 */
+	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown, boolean moveSelectionOnEnter) {
+		super(commitOnUpDown, moveSelectionOnEnter);
+		this.table = table;
+		this.axisElement = axisElement;
+		this.elementProvider = elementProvider;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 */
+	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {
+		this(table, axisElement, elementProvider, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 * @param commitOnUpDown
+	 */
+	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown) {
+		this(table, axisElement, elementProvider, commitOnUpDown, false);
+	}
+
+	/**
+	 *
+	 * @return the edited object
+	 */
+	protected abstract EObject getEditedEObject();
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#activateCell(org.eclipse.swt.widgets.Composite, java.lang.Object)
+	 *
+	 * @param parent
+	 * @param originalCanonicalValue
+	 * @return
+	 */
+	@Override
+	protected Control activateCell(Composite parent, Object originalCanonicalValue) {
+		this.originalValue = originalCanonicalValue;
+		Composite realParent = parent;
+		if (this.buttonConfiguration != null) {
+			realParent = new Composite(parent, SWT.NONE);
+		}
+		this.text = (StyledText) super.activateCell(realParent, originalCanonicalValue);
+		if (this.buttonConfiguration != null) {
+			this.editorControl = realParent;
+			GridLayout gridLayout = new GridLayout(2, false);
+			gridLayout.horizontalSpacing = 0;
+			gridLayout.verticalSpacing = 0;
+			gridLayout.marginHeight = 0;
+			gridLayout.marginWidth = 0;
+			realParent.setLayout(gridLayout);
+
+			GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+			text.setLayoutData(gridData);
+
+			Button b = createAdditionalButton(realParent);
+			GridData buttonGridData = new GridData(SWT.RIGHT, SWT.FILL, false, true);
+			b.setLayoutData(buttonGridData);
+			this.buttonConfiguration.setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());
+		} else {
+			this.editorControl = text;
+		}
+		return this.editorControl;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#getEditorControl()
+	 *
+	 * @return
+	 */
+	@Override
+	public Control getEditorControl() {
+		return editorControl;
+	}
+
+	/**
+	 * 
+	 * @param composite
+	 *            the composite parent
+	 * @return
+	 *         the created button
+	 * 
+	 */
+	protected Button createAdditionalButton(Composite composite) {
+		Button button = new Button(composite, SWT.NONE);
+		button.setText(this.buttonConfiguration.getText());
+		button.setToolTipText(this.buttonConfiguration.getTooltipText());
+		button.setImage(this.buttonConfiguration.getImage());
+		button.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				runButtonAction();
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		return button;
+	}
+
+
+	/**
+	 * execute the action declared in the button
+	 */
+	protected void runButtonAction() {
+		if (Window.OK == this.buttonConfiguration.openDialog(parent, originalValue, layerCell, configRegistry)) {
+			setCanonicalValue(this.buttonConfiguration.getEditorValue());
+			commit(MoveDirectionEnum.NONE);
+		} else {
+			close();
+		}
+	}
+
+	/**
+	 * This method allow to define the behavior of the an additional button located at the right of the text field in the cell
+	 * 
+	 * @param additionalAction
+	 */
+	public void setOpenDialogCellEditorButtonAction(AbstractOpenDialogCellEditorButtonAction additionalAction) {
+		this.buttonConfiguration = additionalAction;
+		if (additionalAction != null) {
+			Assert.isNotNull(additionalAction);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
index 779363e7890..cfcbed6eacc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
@@ -1,120 +1,120 @@
-/*****************************************************************************

- * 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.celleditor;

-

-import org.eclipse.swt.graphics.Image;

-

-/**

- * This class allows to store required information to customize

- * a Button and define the action done when it is pressed.

- */

-public class ButtonConfiguration {

-

-	/** The text to use for the button. */

-	private String text;

-

-	/** The tooltip to use for the button. */

-	private String tooltipText;

-

-	/** the action done by the button. */

-	private AbstractComboAction action;

-

-	/** the image to set on the button. */

-	private Image image;

-

-

-	/**

-	 * Gets the image.

-	 *

-	 * @return the image

-	 */

-	public Image getImage() {

-		return image;

-	}

-

-

-	/**

-	 * Sets the image.

-	 *

-	 * @param image

-	 *            the new image

-	 */

-	public void setImage(Image image) {

-		this.image = image;

-	}

-

-

-	/**

-	 * Gets the text.

-	 *

-	 * @return the text

-	 */

-	public String getText() {

-		return text;

-	}

-

-

-	/**

-	 * Sets the text.

-	 *

-	 * @param text

-	 *            the new text

-	 */

-	public void setText(String text) {

-		this.text = text;

-	}

-

-

-	/**

-	 * Gets the tooltip text.

-	 *

-	 * @return the tooltip text

-	 */

-	public String getTooltipText() {

-		return tooltipText;

-	}

-

-

-	/**

-	 * Sets the tooltip text.

-	 *

-	 * @param tooltipText

-	 *            the new tooltip text

-	 */

-	public void setTooltipText(String tooltipText) {

-		this.tooltipText = tooltipText;

-	}

-

-

-	/**

-	 * Gets the action.

-	 *

-	 * @return the action

-	 */

-	public AbstractComboAction getAction() {

-		return action;

-	}

-

-

-	/**

-	 * Sets the action.

-	 *

-	 * @param action

-	 *            the new action

-	 */

-	public void setAction(AbstractComboAction action) {

-		this.action = action;

-	}

-

-}

+/*****************************************************************************
+ * 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.celleditor;
+
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This class allows to store required information to customize
+ * a Button and define the action done when it is pressed.
+ */
+public class ButtonConfiguration {
+
+	/** The text to use for the button. */
+	private String text;
+
+	/** The tooltip to use for the button. */
+	private String tooltipText;
+
+	/** the action done by the button. */
+	private AbstractComboAction action;
+
+	/** the image to set on the button. */
+	private Image image;
+
+
+	/**
+	 * Gets the image.
+	 *
+	 * @return the image
+	 */
+	public Image getImage() {
+		return image;
+	}
+
+
+	/**
+	 * Sets the image.
+	 *
+	 * @param image
+	 *            the new image
+	 */
+	public void setImage(Image image) {
+		this.image = image;
+	}
+
+
+	/**
+	 * Gets the text.
+	 *
+	 * @return the text
+	 */
+	public String getText() {
+		return text;
+	}
+
+
+	/**
+	 * Sets the text.
+	 *
+	 * @param text
+	 *            the new text
+	 */
+	public void setText(String text) {
+		this.text = text;
+	}
+
+
+	/**
+	 * Gets the tooltip text.
+	 *
+	 * @return the tooltip text
+	 */
+	public String getTooltipText() {
+		return tooltipText;
+	}
+
+
+	/**
+	 * Sets the tooltip text.
+	 *
+	 * @param tooltipText
+	 *            the new tooltip text
+	 */
+	public void setTooltipText(String tooltipText) {
+		this.tooltipText = tooltipText;
+	}
+
+
+	/**
+	 * Gets the action.
+	 *
+	 * @return the action
+	 */
+	public AbstractComboAction getAction() {
+		return action;
+	}
+
+
+	/**
+	 * Sets the action.
+	 *
+	 * @param action
+	 *            the new action
+	 */
+	public void setAction(AbstractComboAction action) {
+		this.action = action;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
index 92411549901..c48fdc07d57 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
@@ -1,177 +1,177 @@
-/*****************************************************************************

- * 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.celleditor;

-

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;

-import org.eclipse.nebula.widgets.nattable.widget.NatCombo;

-import org.eclipse.papyrus.infra.nattable.widget.NatComboButton;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Cursor;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ComboBoxWithButtonCellEditor extends ComboBoxCellEditor {

-

-	/**

-	 * the action done by the button

-	 */

-	private ButtonConfiguration buttonConfiguration;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param buttonConfig

-	 *            the action done by the button

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration buttonConfig) {

-		this(dataProvider, maxVisibleItems, freeEdit, buttonConfig);

-		setMultiselect(multiselect);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {

-		this(dataProvider, maxVisibleItems, action);

-		setFreeEdit(freeEdit);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param maxVisibleItems

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, ButtonConfiguration action) {

-		super(dataProvider, maxVisibleItems);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, ButtonConfiguration action) {

-		super(dataProvider);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration action) {

-		this(canonicalValues, maxVisibleItems, freeEdit, action);

-		setMultiselect(multiselect);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {

-		this(canonicalValues, maxVisibleItems, action);

-		setFreeEdit(freeEdit);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param maxVisibleItems

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, ButtonConfiguration action) {

-		super(canonicalValues, maxVisibleItems);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, ButtonConfiguration action) {

-		super(canonicalValues);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	public NatCombo createEditorControl(Composite parent) {

-		int style = this.editMode == EditModeEnum.INLINE ? SWT.NONE : SWT.BORDER;

-		final NatCombo combo = this.iconImage == null ? new NatComboButton(parent, this.cellStyle, this.maxVisibleItems, this.freeEdit, this.multiselect, style, buttonConfiguration) : new NatComboButton(parent, this.cellStyle, this.maxVisibleItems,

-				this.freeEdit, this.multiselect, style, this.iconImage, buttonConfiguration);

-

-		combo.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));

-

-		if (multiselect) {

-			combo.setMultiselectValueSeparator(this.multiselectValueSeparator);

-			combo.setMultiselectTextBracket(this.multiselectTextPrefix, this.multiselectTextSuffix);

-		}

-

-		addNatComboListener(combo);

-		// configure the action done by the button

-		buttonConfiguration.getAction().setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());

-		buttonConfiguration.getAction().setNatCombo(combo);

-		return combo;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.celleditor;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
+import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
+import org.eclipse.papyrus.infra.nattable.widget.NatComboButton;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ComboBoxWithButtonCellEditor extends ComboBoxCellEditor {
+
+	/**
+	 * the action done by the button
+	 */
+	private ButtonConfiguration buttonConfiguration;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param buttonConfig
+	 *            the action done by the button
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration buttonConfig) {
+		this(dataProvider, maxVisibleItems, freeEdit, buttonConfig);
+		setMultiselect(multiselect);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {
+		this(dataProvider, maxVisibleItems, action);
+		setFreeEdit(freeEdit);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param maxVisibleItems
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, ButtonConfiguration action) {
+		super(dataProvider, maxVisibleItems);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, ButtonConfiguration action) {
+		super(dataProvider);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration action) {
+		this(canonicalValues, maxVisibleItems, freeEdit, action);
+		setMultiselect(multiselect);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {
+		this(canonicalValues, maxVisibleItems, action);
+		setFreeEdit(freeEdit);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param maxVisibleItems
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, ButtonConfiguration action) {
+		super(canonicalValues, maxVisibleItems);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, ButtonConfiguration action) {
+		super(canonicalValues);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	public NatCombo createEditorControl(Composite parent) {
+		int style = this.editMode == EditModeEnum.INLINE ? SWT.NONE : SWT.BORDER;
+		final NatCombo combo = this.iconImage == null ? new NatComboButton(parent, this.cellStyle, this.maxVisibleItems, this.freeEdit, this.multiselect, style, buttonConfiguration) : new NatComboButton(parent, this.cellStyle, this.maxVisibleItems,
+				this.freeEdit, this.multiselect, style, this.iconImage, buttonConfiguration);
+
+		combo.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));
+
+		if (multiselect) {
+			combo.setMultiselectValueSeparator(this.multiselectValueSeparator);
+			combo.setMultiselectTextBracket(this.multiselectTextPrefix, this.multiselectTextSuffix);
+		}
+
+		addNatComboListener(combo);
+		// configure the action done by the button
+		buttonConfiguration.getAction().setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());
+		buttonConfiguration.getAction().setNatCombo(combo);
+		return combo;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java
index 132abde0c9d..3b97367c2ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java
@@ -1,91 +1,91 @@
-/*******************************************************************************

- * Copyright (c) 2013 Dirk Fauth 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:

- *    Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation

- *    Vincent Lorenzo (vincent.lorenzo@cea.fr) - duplicate this class from nattable (change super class)

- *******************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.jface.layout.GridDataFactory;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * A specialization of {@link TextCellEditor} that uses a multi line text editor as

- * editor control. To support multi line editing correctly, the behaviour to commit

- * on pressing the enter key is disabled.

- * <p>

- * A multi line editor usually needs some space. Therefore it might be a good decision to set the configuration attribute {@link EditConfigAttributes#OPEN_IN_DIALOG} to <code>true</code> for this editor, so the editor always opens in a subdialog.

- * </p>

- * <p>

- * As some table layouts may support enough space for an inline cell editor, this editor does not specify {@link ICellEditor#openInline(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.util.List)} to always return <code>false</code>.

- * </p>

- *

- * @author Dirk Fauth

- *

- */

-public class MultiLineTextCellEditor extends TextCellEditor {

-

-	/**

-	 * Flag to configure whether the text control should enable automatic line wrap behaviour

-	 * or not. By default this editor will support automatic line wrapping.

-	 */

-	private boolean lineWrap = true;

-

-	/**

-	 * Create a new multi line text editor that ensures to not commit the editor

-	 * value in case enter is typed. The text control will support automatic line wrapping.

-	 */

-	public MultiLineTextCellEditor() {

-		this(true);

-	}

-

-	/**

-	 * Create a new multi line text editor that ensures to not commit the editor

-	 * value in case enter is typed.

-	 *

-	 * @param lineWrap

-	 *            Flag to configure whether the text control should enable automatic line

-	 *            wrap behaviour or not.

-	 */

-	public MultiLineTextCellEditor(boolean lineWrap) {

-		this.commitOnEnter = false;

-		this.lineWrap = lineWrap;

-	}

-

-	@Override

-	public Text createEditorControl(Composite parent) {

-		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle) | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL;

-		if (lineWrap) {

-			style = style | SWT.WRAP;

-		} else {

-			style = style | SWT.H_SCROLL;

-		}

-		final Text textControl = super.createEditorControl(parent, style);

-

-		if (!openInline(this.configRegistry, this.labelStack.getLabels())) {

-			// add the layout data directly so it will not be layouted by the CellEditDialog

-			GridDataFactory.fillDefaults().grab(true, true).hint(100, 50).applyTo(textControl);

-		}

-

-		return textControl;

-	}

-

-	/**

-	 * @param lineWrap

-	 *            <code>true</code> if the text control should enable automatic line

-	 *            wrap behaviour, <code>false</code> if not

-	 */

-	public void setLineWrap(boolean lineWrap) {

-		this.lineWrap = lineWrap;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2013 Dirk Fauth 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:
+ *    Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
+ *    Vincent Lorenzo (vincent.lorenzo@cea.fr) - duplicate this class from nattable (change super class)
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A specialization of {@link TextCellEditor} that uses a multi line text editor as
+ * editor control. To support multi line editing correctly, the behaviour to commit
+ * on pressing the enter key is disabled.
+ * <p>
+ * A multi line editor usually needs some space. Therefore it might be a good decision to set the configuration attribute {@link EditConfigAttributes#OPEN_IN_DIALOG} to <code>true</code> for this editor, so the editor always opens in a subdialog.
+ * </p>
+ * <p>
+ * As some table layouts may support enough space for an inline cell editor, this editor does not specify {@link ICellEditor#openInline(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.util.List)} to always return <code>false</code>.
+ * </p>
+ *
+ * @author Dirk Fauth
+ *
+ */
+public class MultiLineTextCellEditor extends TextCellEditor {
+
+	/**
+	 * Flag to configure whether the text control should enable automatic line wrap behaviour
+	 * or not. By default this editor will support automatic line wrapping.
+	 */
+	private boolean lineWrap = true;
+
+	/**
+	 * Create a new multi line text editor that ensures to not commit the editor
+	 * value in case enter is typed. The text control will support automatic line wrapping.
+	 */
+	public MultiLineTextCellEditor() {
+		this(true);
+	}
+
+	/**
+	 * Create a new multi line text editor that ensures to not commit the editor
+	 * value in case enter is typed.
+	 *
+	 * @param lineWrap
+	 *            Flag to configure whether the text control should enable automatic line
+	 *            wrap behaviour or not.
+	 */
+	public MultiLineTextCellEditor(boolean lineWrap) {
+		this.commitOnEnter = false;
+		this.lineWrap = lineWrap;
+	}
+
+	@Override
+	public Text createEditorControl(Composite parent) {
+		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle) | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL;
+		if (lineWrap) {
+			style = style | SWT.WRAP;
+		} else {
+			style = style | SWT.H_SCROLL;
+		}
+		final Text textControl = super.createEditorControl(parent, style);
+
+		if (!openInline(this.configRegistry, this.labelStack.getLabels())) {
+			// add the layout data directly so it will not be layouted by the CellEditDialog
+			GridDataFactory.fillDefaults().grab(true, true).hint(100, 50).applyTo(textControl);
+		}
+
+		return textControl;
+	}
+
+	/**
+	 * @param lineWrap
+	 *            <code>true</code> if the text control should enable automatic line
+	 *            wrap behaviour, <code>false</code> if not
+	 */
+	public void setLineWrap(boolean lineWrap) {
+		this.lineWrap = lineWrap;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
index 73d04de17d6..84982531c15 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
@@ -1,152 +1,152 @@
-/*****************************************************************************

- * 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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.events.ControlListener;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.keys.IBindingService;

-

-/**

- *

- * @author Vincent Lorenzo

- *         This multi line cell editor has the same behavior than spreadsheet (ALT+ENTER (Excel)for new line and ENTER to commit).

- *         To get this behavior, we desactivate the filtering done by org.eclipse.e4.ui.bindings.keys.KeyBindingDispatcher. This class

- *         set event.doit==false if the keypressed are binding for eclipse command (ALT-ENTER is registered to show property view)

- *

- *         //TODO : the next version of nattable seems support this behavior with ALT-ENTER,

- */

-public class MultiLineTextCellEditorEx extends MultiLineTextCellEditor {

-

-	/**

-	 * boolean indicating if the eclipse filter was activated when the editor has been created

-	 */

-	private boolean initialValueForFilteringKeyPress;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public MultiLineTextCellEditorEx() {

-		super();

-		this.commitOnEnter = true;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param lineWrap

-	 */

-	public MultiLineTextCellEditorEx(boolean lineWrap) {

-		super(lineWrap);

-		this.commitOnEnter = true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	public Text createEditorControl(Composite parent) {

-		IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);

-		this.initialValueForFilteringKeyPress = service.isKeyFilterEnabled();

-		if (this.initialValueForFilteringKeyPress) {

-			service.setKeyFilterEnabled(false);

-		}

-		final Text text = super.createEditorControl(parent);

-

-		// this listener allows us to initialize the text widget wit the best size in order to display the full lines of the text

-		text.addControlListener(new ControlListener() {

-

-			@Override

-			public void controlResized(ControlEvent e) {

-				final Rectangle bounds = text.getBounds();

-				final int nbLines = text.getLineCount();

-				text.removeControlListener(this);

-				if (nbLines > 1) {

-					text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));

-				}

-				text.removeControlListener(this);

-

-			}

-

-			/**

-			 *

-			 * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent)

-			 *

-			 * @param e

-			 */

-			@Override

-			public void controlMoved(ControlEvent e) {

-				// nothing to do

-			}

-		});

-		return text;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#close()

-	 *

-	 */

-	@Override

-	public void close() {

-		if (this.initialValueForFilteringKeyPress) {

-			IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);

-			service.setKeyFilterEnabled(this.initialValueForFilteringKeyPress);

-		}

-		super.close();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#keyPressed(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Text, org.eclipse.swt.events.KeyEvent)

-	 *

-	 * @param parent

-	 * @param text

-	 * @param event

-	 */

-	@Override

-	protected void keyPressed(Composite parent, Text text, KeyEvent event) {

-		if (event.stateMask == SWT.ALT && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {

-			text.insert(text.getLineDelimiter());

-			// we resize the text widget in order to display all lines

-			final Rectangle bounds = text.getBounds();

-			text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));

-		} else {

-			super.keyPressed(parent, text, event);

-		}

-	}

-

-	/**

-	 *

-	 * @param text

-	 *            the text widget

-	 * @return

-	 *         the best height for the text widget according to the number of new line in the text + the height ot a line

-	 */

-	protected final int getBestHeight(final Text text) {

-		return (text.getLineCount() + 1) * text.getLineHeight();

-	}

-}

+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.keys.IBindingService;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         This multi line cell editor has the same behavior than spreadsheet (ALT+ENTER (Excel)for new line and ENTER to commit).
+ *         To get this behavior, we desactivate the filtering done by org.eclipse.e4.ui.bindings.keys.KeyBindingDispatcher. This class
+ *         set event.doit==false if the keypressed are binding for eclipse command (ALT-ENTER is registered to show property view)
+ *
+ *         //TODO : the next version of nattable seems support this behavior with ALT-ENTER,
+ */
+public class MultiLineTextCellEditorEx extends MultiLineTextCellEditor {
+
+	/**
+	 * boolean indicating if the eclipse filter was activated when the editor has been created
+	 */
+	private boolean initialValueForFilteringKeyPress;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public MultiLineTextCellEditorEx() {
+		super();
+		this.commitOnEnter = true;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param lineWrap
+	 */
+	public MultiLineTextCellEditorEx(boolean lineWrap) {
+		super(lineWrap);
+		this.commitOnEnter = true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	public Text createEditorControl(Composite parent) {
+		IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
+		this.initialValueForFilteringKeyPress = service.isKeyFilterEnabled();
+		if (this.initialValueForFilteringKeyPress) {
+			service.setKeyFilterEnabled(false);
+		}
+		final Text text = super.createEditorControl(parent);
+
+		// this listener allows us to initialize the text widget wit the best size in order to display the full lines of the text
+		text.addControlListener(new ControlListener() {
+
+			@Override
+			public void controlResized(ControlEvent e) {
+				final Rectangle bounds = text.getBounds();
+				final int nbLines = text.getLineCount();
+				text.removeControlListener(this);
+				if (nbLines > 1) {
+					text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));
+				}
+				text.removeControlListener(this);
+
+			}
+
+			/**
+			 *
+			 * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent)
+			 *
+			 * @param e
+			 */
+			@Override
+			public void controlMoved(ControlEvent e) {
+				// nothing to do
+			}
+		});
+		return text;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#close()
+	 *
+	 */
+	@Override
+	public void close() {
+		if (this.initialValueForFilteringKeyPress) {
+			IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
+			service.setKeyFilterEnabled(this.initialValueForFilteringKeyPress);
+		}
+		super.close();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#keyPressed(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Text, org.eclipse.swt.events.KeyEvent)
+	 *
+	 * @param parent
+	 * @param text
+	 * @param event
+	 */
+	@Override
+	protected void keyPressed(Composite parent, Text text, KeyEvent event) {
+		if (event.stateMask == SWT.ALT && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {
+			text.insert(text.getLineDelimiter());
+			// we resize the text widget in order to display all lines
+			final Rectangle bounds = text.getBounds();
+			text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));
+		} else {
+			super.keyPressed(parent, text, event);
+		}
+	}
+
+	/**
+	 *
+	 * @param text
+	 *            the text widget
+	 * @return
+	 *         the best height for the text widget according to the number of new line in the text + the height ot a line
+	 */
+	protected final int getBestHeight(final Text text) {
+		return (text.getLineCount() + 1) * text.getLineHeight();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java
index faf2f154f57..56db4750355 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java
@@ -1,455 +1,455 @@
-/*******************************************************************************

- * Copyright (c) 2012 Original authors 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:

- *     Vincent Lorenzo (CEA-LIST)  - duplicated and adapted code from nattable project.

- *

- ******************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.config.RenderErrorHandling;

-import org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ControlDecorationProvider;

-import org.eclipse.nebula.widgets.nattable.edit.editor.EditorSelectionEnum;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;

-import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;

-import org.eclipse.nebula.widgets.nattable.style.IStyle;

-import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyAdapter;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.graphics.Cursor;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * {@link ICellEditor} implementation that wraps a SWT {@link Text} control to support

- * text editing. This is also the default editor in NatTable if you didn't configure

- * something else.

- *

- * duplicated and adapted code from nattable project. Add the method {@link #keyPressed(Composite, KeyEvent)} to allow to ovveride it

- */

-public class TextCellEditor extends AbstractCellEditor {

-

-	/**

-	 * The Text control which is the editor wrapped by this TextCellEditor.

-	 */

-	private Text text = null;

-

-	/**

-	 * Flag to configure if the wrapped text editor control is editable or not.

-	 */

-	private boolean editable = true;

-

-	/**

-	 * Flag to configure whether the editor should commit and move the selection

-	 * in the corresponding way if the up or down key is pressed.

-	 */

-	private final boolean commitOnUpDown;

-

-	/**

-	 * Flag to configure whether the selection should move after a value was

-	 * committed after pressing enter.

-	 */

-	private final boolean moveSelectionOnEnter;

-

-	/**

-	 * The selection mode that should be used on activating the wrapped text control.

-	 * By default the behaviour is to set the selection at the end of the containing text

-	 * if the text editor control is activated with an initial value. If it is activated

-	 * only specifying the original canonical value, the default behaviour is to select

-	 * the whole text contained in the text editor control.

-	 *

-	 * <p>

-	 * You can override this default behaviour by setting an {@link EditorSelectionEnum} explicitly. With this you are able e.g. to set the selection at the beginning of the contained text, so writing in the text control will result in prefixing.

-	 *

-	 * <p>

-	 * Note that on overriding the behaviour, you override both activation cases.

-	 */

-	private EditorSelectionEnum selectionMode;

-

-	/**

-	 * The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control. Can be configured via

-	 * convenience methods of this TextCellEditor.

-	 */

-	protected final ControlDecorationProvider decorationProvider = new ControlDecorationProvider();

-

-	/**

-	 * The {@link IEditErrorHandler} that is used for showing conversion errors on typing into

-	 * this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 * content in the editor red to indicate a conversion error.

-	 */

-	private IEditErrorHandler inputConversionErrorHandler = new RenderErrorHandling(decorationProvider);

-

-	/**

-	 * The {@link IEditErrorHandler} that is used for showing validation errors on typing into

-	 * this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 * content in the editor red to indicate a validation error.

-	 */

-	private IEditErrorHandler inputValidationErrorHandler = new RenderErrorHandling(decorationProvider);

-

-	/**

-	 * Flag to determine whether this editor should try to commit and close on pressing the enter key.

-	 * The default is of course <code>true</code>, but for a multi line text editor, the enter key

-	 * should be treated as inserting a new line instead of committing.

-	 */

-	protected boolean commitOnEnter = true;

-

-	/**

-	 * Creates the default TextCellEditor that does not commit on pressing the up/down arrow keys

-	 * and will not move the selection on committing a value by pressing enter.

-	 */

-	public TextCellEditor() {

-		this(false);

-	}

-

-	/**

-	 * Creates a TextCellEditor that will not move the selection on committing a value by pressing enter.

-	 *

-	 * @param commitOnUpDown

-	 *            Flag to configure whether the editor should commit

-	 *            and move the selection in the corresponding way if the up or down key is pressed.

-	 */

-	public TextCellEditor(boolean commitOnUpDown) {

-		this(commitOnUpDown, false);

-	}

-

-	/**

-	 * Creates a TextCellEditor.

-	 *

-	 * @param commitOnUpDown

-	 *            Flag to configure whether the editor should commit

-	 *            and move the selection in the corresponding way if the up or down key is pressed.

-	 * @param moveSelectionOnEnter

-	 *            Flag to configure whether the selection should move after a value was

-	 *            committed after pressing enter.

-	 */

-	public TextCellEditor(boolean commitOnUpDown, boolean moveSelectionOnEnter) {

-		this.commitOnUpDown = commitOnUpDown;

-		this.moveSelectionOnEnter = moveSelectionOnEnter;

-	}

-

-	@Override

-	protected Control activateCell(final Composite parent, Object originalCanonicalValue) {

-		this.text = createEditorControl(parent);

-

-		// If the originalCanonicalValue is a Character it is possible the editor is activated by keypress

-		if (originalCanonicalValue instanceof Character) {

-			this.text.setText(originalCanonicalValue.toString());

-			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.END);

-		}

-		// if there is no initial value, handle the original canonical value to transfer it to the text control

-		else {

-			setCanonicalValue(originalCanonicalValue);

-			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.ALL);

-		}

-

-		if (!isEditable()) {

-			this.text.setEditable(false);

-		}

-

-		// show an error decoration if this is enabled

-		this.decorationProvider.createErrorDecorationIfRequired(this.text);

-

-		// if the input error handlers are of type RenderErrorHandler (default) than

-		// we also check for a possible configured error styling in the configuration

-		// Note: this is currently only implemented in here, as the TextCellEditor is

-		// the only editor that supports just in time conversion/validation

-		if (this.inputConversionErrorHandler instanceof RenderErrorHandling) {

-			IStyle conversionErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.CONVERSION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());

-

-			((RenderErrorHandling) this.inputConversionErrorHandler).setErrorStyle(conversionErrorStyle);

-		}

-

-		if (this.inputValidationErrorHandler instanceof RenderErrorHandling) {

-			IStyle validationErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());

-

-			((RenderErrorHandling) this.inputValidationErrorHandler).setErrorStyle(validationErrorStyle);

-		}

-

-		this.text.forceFocus();

-

-		return this.text;

-	}

-

-	@Override

-	public String getEditorValue() {

-		return this.text.getText();

-	}

-

-	@Override

-	public void setEditorValue(Object value) {

-		this.text.setText(value != null && value.toString().length() > 0 ? value.toString() : ""); //$NON-NLS-1$

-	}

-

-	@Override

-	public Text getEditorControl() {

-		return this.text;

-	}

-

-	@Override

-	public Text createEditorControl(Composite parent) {

-		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle);

-		if (this.editMode == EditModeEnum.DIALOG) {

-			style = style | SWT.BORDER;

-		}

-		return createEditorControl(parent, style);

-	}

-

-	/**

-	 * Creates the editor control that is wrapped by this ICellEditor.

-	 * Will use the style configurations in ConfigRegistry for styling the control.

-	 *

-	 * @param parent

-	 *            The Composite that will be the parent of the new editor control.

-	 *            Can not be <code>null</code>

-	 * @param style

-	 *            The SWT style of the text control to create.

-	 * @return The created editor control that is wrapped by this ICellEditor.

-	 */

-	protected Text createEditorControl(final Composite parent, int style) {

-		// create the Text control based on the specified style

-		final Text textControl = new Text(parent, style);

-

-		// set style information configured in the associated cell style

-		textControl.setBackground(this.cellStyle.getAttributeValue(CellStyleAttributes.BACKGROUND_COLOR));

-		textControl.setForeground(this.cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR));

-		textControl.setFont(this.cellStyle.getAttributeValue(CellStyleAttributes.FONT));

-

-		textControl.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));

-

-		// add a key listener that will commit or close the editor for special key strokes

-		// and executes conversion/validation on input to the editor

-		textControl.addKeyListener(new KeyAdapter() {

-

-			@Override

-			public void keyPressed(KeyEvent event) {

-				TextCellEditor.this.keyPressed(parent, textControl, event);

-			}

-

-			@Override

-			public void keyReleased(KeyEvent e) {

-				try {

-					// always do the conversion

-					Object canonicalValue = getCanonicalValue(inputConversionErrorHandler);

-					// and always do the validation

-					// even if for commiting the validation should be skipped, on editing

-					// a validation failure should be made visible

-					// otherwise there would be no need for validation!

-					validateCanonicalValue(canonicalValue, inputValidationErrorHandler);

-				} catch (Exception ex) {

-					// do nothing as exceptions caused by conversion or validation are handled already

-					// we just need this catch block for stopping the process if conversion failed with

-					// an exception

-				}

-			}

-		});

-

-		return textControl;

-	}

-

-	protected void keyPressed(Composite parent, Text text, KeyEvent event) {

-		if (commitOnEnter && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {

-

-			MoveDirectionEnum move = MoveDirectionEnum.NONE;

-			if (moveSelectionOnEnter && editMode == EditModeEnum.INLINE) {

-				if (event.stateMask == 0) {

-					move = MoveDirectionEnum.DOWN;

-				} else if (event.stateMask == SWT.SHIFT) {

-					move = MoveDirectionEnum.UP;

-				}

-			}

-

-			commit(move);

-

-			if (editMode == EditModeEnum.DIALOG) {

-				parent.forceFocus();

-			}

-		} else if (event.keyCode == SWT.ESC && event.stateMask == 0) {

-			close();

-		} else if (commitOnUpDown && editMode == EditModeEnum.INLINE) {

-			if (event.keyCode == SWT.ARROW_UP) {

-				commit(MoveDirectionEnum.UP);

-			} else if (event.keyCode == SWT.ARROW_DOWN) {

-				commit(MoveDirectionEnum.DOWN);

-			}

-		}

-	}

-

-	@Override

-	public void close() {

-		super.close();

-

-		this.decorationProvider.dispose();

-	}

-

-	/**

-	 * @return <code>true</code> if the wrapped Text control is editable, <code>false</code> if not.

-	 */

-	public boolean isEditable() {

-		return editable;

-	}

-

-	/**

-	 *

-	 * @param editable

-	 *            <code>true</code> if the wrapped Text control should be editable, <code>false</code> if not.

-	 */

-	public void setEditable(boolean editable) {

-		this.editable = editable;

-	}

-

-	/**

-	 * Returns the current configured selection mode that is used on activating the wrapped

-	 * text editor control. By default this is <code>null</code> which causes the following

-	 * default behaviour. If the text editor control is activated with an initial value then

-	 * the selection is set at the end of the containing text. If it is activated

-	 * only specifying the original canonical value, the default behaviour is to select

-	 * the whole text contained in the text editor control.

-	 *

-	 * @return The current configured selection mode, <code>null</code> for default behaviour.

-	 */

-	public final EditorSelectionEnum getSelectionMode() {

-		return selectionMode;

-	}

-

-	/**

-	 * Set the selection mode that should be used on the content of the wrapped text editor control

-	 * when it gets activated. By setting a value explicitly you configure the selection mode for

-	 * both cases, activating the wrapped text editor control with and without an initial value.

-	 * Setting this value to <code>null</code> will reactivate the default behaviour like described

-	 * here {@link TextCellEditor#getSelectionMode()}.

-	 *

-	 * @param selectionMode

-	 *            The selection mode that should be used on the content of the

-	 *            wrapped text editor control when it gets activated.

-	 */

-	public final void setSelectionMode(EditorSelectionEnum selectionMode) {

-		this.selectionMode = selectionMode;

-	}

-

-	/**

-	 * Will set the selection to the wrapped text control regarding the configured {@link EditorSelectionEnum}.

-	 *

-	 * <p>

-	 * This method is called

-	 *

-	 * @see Text#setSelection(int, int)

-	 */

-	private void selectText(EditorSelectionEnum selectionMode) {

-		int textLength = this.text.getText().length();

-		if (textLength > 0) {

-			if (selectionMode == EditorSelectionEnum.ALL) {

-				this.text.setSelection(0, textLength);

-			} else if (selectionMode == EditorSelectionEnum.END) {

-				this.text.setSelection(textLength, textLength);

-			} else if (selectionMode == EditorSelectionEnum.START) {

-				this.text.setSelection(0);

-			}

-		}

-	}

-

-	/**

-	 * @return The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control.

-	 */

-	public ControlDecorationProvider getDecorationProvider() {

-		return this.decorationProvider;

-	}

-

-	/**

-	 * Enables/disables the error decoration for the wrapped text control.

-	 *

-	 * @param enabled

-	 *            <code>true</code> if an error decoration should be added to

-	 *            the wrapped text control, <code>false</code> if not.

-	 */

-	public void setErrorDecorationEnabled(boolean enabled) {

-		this.decorationProvider.setErrorDecorationEnabled(enabled);

-	}

-

-	/**

-	 * Set the error description text that will be shown in the decoration hover.

-	 *

-	 * @param errorText

-	 *            The text to be shown as a description for the decoration, or <code>null</code> if there should be no description.

-	 *

-	 * @see ControlDecoration#setDescriptionText(String)

-	 */

-	public void setErrorDecorationText(String errorText) {

-		this.decorationProvider.setErrorDecorationText(errorText);

-	}

-

-	/**

-	 * Force the error decoration hover to show immediately.

-	 *

-	 * @param customErrorText

-	 *            The text to show in the hover popup.

-	 *

-	 * @see ControlDecoration#show()

-	 * @see ControlDecoration#showHoverText(String)

-	 */

-	public void showErrorDecorationHover(String customErrorText) {

-		this.decorationProvider.showErrorDecorationHover(customErrorText);

-	}

-

-	/**

-	 * Set the position of the control decoration relative to the control.

-	 * It should include style bits describing both the vertical and horizontal orientation.

-	 *

-	 * @param decorationPositionOverride

-	 *            bit-wise or of position constants (<code>SWT.TOP</code>, <code>SWT.BOTTOM</code>, <code>SWT.LEFT</code>, <code>SWT.RIGHT</code>, and <code>SWT.CENTER</code>).

-	 *

-	 * @see ControlDecoration#ControlDecoration(Control, int)

-	 */

-	public void setDecorationPositionOverride(int decorationPositionOverride) {

-		this.decorationProvider.setDecorationPositionOverride(decorationPositionOverride);

-	}

-

-	/**

-	 * @return The {@link IEditErrorHandler} that is used for showing conversion errors on typing into

-	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 *         content in the editor red to indicate a conversion error.

-	 */

-	public IEditErrorHandler getInputConversionErrorHandler() {

-		return this.inputConversionErrorHandler;

-	}

-

-	/**

-	 * @param inputConversionErrorHandler

-	 *            The {@link IEditErrorHandler} that is should be used for showing

-	 *            conversion errors on typing into this editor.

-	 */

-	public void setInputConversionErrorHandler(IEditErrorHandler inputConversionErrorHandler) {

-		this.inputConversionErrorHandler = inputConversionErrorHandler;

-	}

-

-	/**

-	 * @return The {@link IEditErrorHandler} that is used for showing validation errors on typing into

-	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 *         content in the editor red to indicate a validation error.

-	 */

-	public IEditErrorHandler getInputValidationErrorHandler() {

-		return this.inputValidationErrorHandler;

-	}

-

-	/**

-	 * @param inputValidationErrorHandler

-	 *            The {@link IEditErrorHandler} that is should used for showing

-	 *            validation errors on typing into this editor.

-	 */

-	public void setInputValidationErrorHandler(IEditErrorHandler inputValidationErrorHandler) {

-		this.inputValidationErrorHandler = inputValidationErrorHandler;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 Original authors 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:
+ *     Vincent Lorenzo (CEA-LIST)  - duplicated and adapted code from nattable project.
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.config.RenderErrorHandling;
+import org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ControlDecorationProvider;
+import org.eclipse.nebula.widgets.nattable.edit.editor.EditorSelectionEnum;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
+import org.eclipse.nebula.widgets.nattable.style.IStyle;
+import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * {@link ICellEditor} implementation that wraps a SWT {@link Text} control to support
+ * text editing. This is also the default editor in NatTable if you didn't configure
+ * something else.
+ *
+ * duplicated and adapted code from nattable project. Add the method {@link #keyPressed(Composite, KeyEvent)} to allow to ovveride it
+ */
+public class TextCellEditor extends AbstractCellEditor {
+
+	/**
+	 * The Text control which is the editor wrapped by this TextCellEditor.
+	 */
+	private Text text = null;
+
+	/**
+	 * Flag to configure if the wrapped text editor control is editable or not.
+	 */
+	private boolean editable = true;
+
+	/**
+	 * Flag to configure whether the editor should commit and move the selection
+	 * in the corresponding way if the up or down key is pressed.
+	 */
+	private final boolean commitOnUpDown;
+
+	/**
+	 * Flag to configure whether the selection should move after a value was
+	 * committed after pressing enter.
+	 */
+	private final boolean moveSelectionOnEnter;
+
+	/**
+	 * The selection mode that should be used on activating the wrapped text control.
+	 * By default the behaviour is to set the selection at the end of the containing text
+	 * if the text editor control is activated with an initial value. If it is activated
+	 * only specifying the original canonical value, the default behaviour is to select
+	 * the whole text contained in the text editor control.
+	 *
+	 * <p>
+	 * You can override this default behaviour by setting an {@link EditorSelectionEnum} explicitly. With this you are able e.g. to set the selection at the beginning of the contained text, so writing in the text control will result in prefixing.
+	 *
+	 * <p>
+	 * Note that on overriding the behaviour, you override both activation cases.
+	 */
+	private EditorSelectionEnum selectionMode;
+
+	/**
+	 * The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control. Can be configured via
+	 * convenience methods of this TextCellEditor.
+	 */
+	protected final ControlDecorationProvider decorationProvider = new ControlDecorationProvider();
+
+	/**
+	 * The {@link IEditErrorHandler} that is used for showing conversion errors on typing into
+	 * this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 * content in the editor red to indicate a conversion error.
+	 */
+	private IEditErrorHandler inputConversionErrorHandler = new RenderErrorHandling(decorationProvider);
+
+	/**
+	 * The {@link IEditErrorHandler} that is used for showing validation errors on typing into
+	 * this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 * content in the editor red to indicate a validation error.
+	 */
+	private IEditErrorHandler inputValidationErrorHandler = new RenderErrorHandling(decorationProvider);
+
+	/**
+	 * Flag to determine whether this editor should try to commit and close on pressing the enter key.
+	 * The default is of course <code>true</code>, but for a multi line text editor, the enter key
+	 * should be treated as inserting a new line instead of committing.
+	 */
+	protected boolean commitOnEnter = true;
+
+	/**
+	 * Creates the default TextCellEditor that does not commit on pressing the up/down arrow keys
+	 * and will not move the selection on committing a value by pressing enter.
+	 */
+	public TextCellEditor() {
+		this(false);
+	}
+
+	/**
+	 * Creates a TextCellEditor that will not move the selection on committing a value by pressing enter.
+	 *
+	 * @param commitOnUpDown
+	 *            Flag to configure whether the editor should commit
+	 *            and move the selection in the corresponding way if the up or down key is pressed.
+	 */
+	public TextCellEditor(boolean commitOnUpDown) {
+		this(commitOnUpDown, false);
+	}
+
+	/**
+	 * Creates a TextCellEditor.
+	 *
+	 * @param commitOnUpDown
+	 *            Flag to configure whether the editor should commit
+	 *            and move the selection in the corresponding way if the up or down key is pressed.
+	 * @param moveSelectionOnEnter
+	 *            Flag to configure whether the selection should move after a value was
+	 *            committed after pressing enter.
+	 */
+	public TextCellEditor(boolean commitOnUpDown, boolean moveSelectionOnEnter) {
+		this.commitOnUpDown = commitOnUpDown;
+		this.moveSelectionOnEnter = moveSelectionOnEnter;
+	}
+
+	@Override
+	protected Control activateCell(final Composite parent, Object originalCanonicalValue) {
+		this.text = createEditorControl(parent);
+
+		// If the originalCanonicalValue is a Character it is possible the editor is activated by keypress
+		if (originalCanonicalValue instanceof Character) {
+			this.text.setText(originalCanonicalValue.toString());
+			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.END);
+		}
+		// if there is no initial value, handle the original canonical value to transfer it to the text control
+		else {
+			setCanonicalValue(originalCanonicalValue);
+			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.ALL);
+		}
+
+		if (!isEditable()) {
+			this.text.setEditable(false);
+		}
+
+		// show an error decoration if this is enabled
+		this.decorationProvider.createErrorDecorationIfRequired(this.text);
+
+		// if the input error handlers are of type RenderErrorHandler (default) than
+		// we also check for a possible configured error styling in the configuration
+		// Note: this is currently only implemented in here, as the TextCellEditor is
+		// the only editor that supports just in time conversion/validation
+		if (this.inputConversionErrorHandler instanceof RenderErrorHandling) {
+			IStyle conversionErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.CONVERSION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());
+
+			((RenderErrorHandling) this.inputConversionErrorHandler).setErrorStyle(conversionErrorStyle);
+		}
+
+		if (this.inputValidationErrorHandler instanceof RenderErrorHandling) {
+			IStyle validationErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());
+
+			((RenderErrorHandling) this.inputValidationErrorHandler).setErrorStyle(validationErrorStyle);
+		}
+
+		this.text.forceFocus();
+
+		return this.text;
+	}
+
+	@Override
+	public String getEditorValue() {
+		return this.text.getText();
+	}
+
+	@Override
+	public void setEditorValue(Object value) {
+		this.text.setText(value != null && value.toString().length() > 0 ? value.toString() : ""); //$NON-NLS-1$
+	}
+
+	@Override
+	public Text getEditorControl() {
+		return this.text;
+	}
+
+	@Override
+	public Text createEditorControl(Composite parent) {
+		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle);
+		if (this.editMode == EditModeEnum.DIALOG) {
+			style = style | SWT.BORDER;
+		}
+		return createEditorControl(parent, style);
+	}
+
+	/**
+	 * Creates the editor control that is wrapped by this ICellEditor.
+	 * Will use the style configurations in ConfigRegistry for styling the control.
+	 *
+	 * @param parent
+	 *            The Composite that will be the parent of the new editor control.
+	 *            Can not be <code>null</code>
+	 * @param style
+	 *            The SWT style of the text control to create.
+	 * @return The created editor control that is wrapped by this ICellEditor.
+	 */
+	protected Text createEditorControl(final Composite parent, int style) {
+		// create the Text control based on the specified style
+		final Text textControl = new Text(parent, style);
+
+		// set style information configured in the associated cell style
+		textControl.setBackground(this.cellStyle.getAttributeValue(CellStyleAttributes.BACKGROUND_COLOR));
+		textControl.setForeground(this.cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR));
+		textControl.setFont(this.cellStyle.getAttributeValue(CellStyleAttributes.FONT));
+
+		textControl.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));
+
+		// add a key listener that will commit or close the editor for special key strokes
+		// and executes conversion/validation on input to the editor
+		textControl.addKeyListener(new KeyAdapter() {
+
+			@Override
+			public void keyPressed(KeyEvent event) {
+				TextCellEditor.this.keyPressed(parent, textControl, event);
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				try {
+					// always do the conversion
+					Object canonicalValue = getCanonicalValue(inputConversionErrorHandler);
+					// and always do the validation
+					// even if for commiting the validation should be skipped, on editing
+					// a validation failure should be made visible
+					// otherwise there would be no need for validation!
+					validateCanonicalValue(canonicalValue, inputValidationErrorHandler);
+				} catch (Exception ex) {
+					// do nothing as exceptions caused by conversion or validation are handled already
+					// we just need this catch block for stopping the process if conversion failed with
+					// an exception
+				}
+			}
+		});
+
+		return textControl;
+	}
+
+	protected void keyPressed(Composite parent, Text text, KeyEvent event) {
+		if (commitOnEnter && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {
+
+			MoveDirectionEnum move = MoveDirectionEnum.NONE;
+			if (moveSelectionOnEnter && editMode == EditModeEnum.INLINE) {
+				if (event.stateMask == 0) {
+					move = MoveDirectionEnum.DOWN;
+				} else if (event.stateMask == SWT.SHIFT) {
+					move = MoveDirectionEnum.UP;
+				}
+			}
+
+			commit(move);
+
+			if (editMode == EditModeEnum.DIALOG) {
+				parent.forceFocus();
+			}
+		} else if (event.keyCode == SWT.ESC && event.stateMask == 0) {
+			close();
+		} else if (commitOnUpDown && editMode == EditModeEnum.INLINE) {
+			if (event.keyCode == SWT.ARROW_UP) {
+				commit(MoveDirectionEnum.UP);
+			} else if (event.keyCode == SWT.ARROW_DOWN) {
+				commit(MoveDirectionEnum.DOWN);
+			}
+		}
+	}
+
+	@Override
+	public void close() {
+		super.close();
+
+		this.decorationProvider.dispose();
+	}
+
+	/**
+	 * @return <code>true</code> if the wrapped Text control is editable, <code>false</code> if not.
+	 */
+	public boolean isEditable() {
+		return editable;
+	}
+
+	/**
+	 *
+	 * @param editable
+	 *            <code>true</code> if the wrapped Text control should be editable, <code>false</code> if not.
+	 */
+	public void setEditable(boolean editable) {
+		this.editable = editable;
+	}
+
+	/**
+	 * Returns the current configured selection mode that is used on activating the wrapped
+	 * text editor control. By default this is <code>null</code> which causes the following
+	 * default behaviour. If the text editor control is activated with an initial value then
+	 * the selection is set at the end of the containing text. If it is activated
+	 * only specifying the original canonical value, the default behaviour is to select
+	 * the whole text contained in the text editor control.
+	 *
+	 * @return The current configured selection mode, <code>null</code> for default behaviour.
+	 */
+	public final EditorSelectionEnum getSelectionMode() {
+		return selectionMode;
+	}
+
+	/**
+	 * Set the selection mode that should be used on the content of the wrapped text editor control
+	 * when it gets activated. By setting a value explicitly you configure the selection mode for
+	 * both cases, activating the wrapped text editor control with and without an initial value.
+	 * Setting this value to <code>null</code> will reactivate the default behaviour like described
+	 * here {@link TextCellEditor#getSelectionMode()}.
+	 *
+	 * @param selectionMode
+	 *            The selection mode that should be used on the content of the
+	 *            wrapped text editor control when it gets activated.
+	 */
+	public final void setSelectionMode(EditorSelectionEnum selectionMode) {
+		this.selectionMode = selectionMode;
+	}
+
+	/**
+	 * Will set the selection to the wrapped text control regarding the configured {@link EditorSelectionEnum}.
+	 *
+	 * <p>
+	 * This method is called
+	 *
+	 * @see Text#setSelection(int, int)
+	 */
+	private void selectText(EditorSelectionEnum selectionMode) {
+		int textLength = this.text.getText().length();
+		if (textLength > 0) {
+			if (selectionMode == EditorSelectionEnum.ALL) {
+				this.text.setSelection(0, textLength);
+			} else if (selectionMode == EditorSelectionEnum.END) {
+				this.text.setSelection(textLength, textLength);
+			} else if (selectionMode == EditorSelectionEnum.START) {
+				this.text.setSelection(0);
+			}
+		}
+	}
+
+	/**
+	 * @return The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control.
+	 */
+	public ControlDecorationProvider getDecorationProvider() {
+		return this.decorationProvider;
+	}
+
+	/**
+	 * Enables/disables the error decoration for the wrapped text control.
+	 *
+	 * @param enabled
+	 *            <code>true</code> if an error decoration should be added to
+	 *            the wrapped text control, <code>false</code> if not.
+	 */
+	public void setErrorDecorationEnabled(boolean enabled) {
+		this.decorationProvider.setErrorDecorationEnabled(enabled);
+	}
+
+	/**
+	 * Set the error description text that will be shown in the decoration hover.
+	 *
+	 * @param errorText
+	 *            The text to be shown as a description for the decoration, or <code>null</code> if there should be no description.
+	 *
+	 * @see ControlDecoration#setDescriptionText(String)
+	 */
+	public void setErrorDecorationText(String errorText) {
+		this.decorationProvider.setErrorDecorationText(errorText);
+	}
+
+	/**
+	 * Force the error decoration hover to show immediately.
+	 *
+	 * @param customErrorText
+	 *            The text to show in the hover popup.
+	 *
+	 * @see ControlDecoration#show()
+	 * @see ControlDecoration#showHoverText(String)
+	 */
+	public void showErrorDecorationHover(String customErrorText) {
+		this.decorationProvider.showErrorDecorationHover(customErrorText);
+	}
+
+	/**
+	 * Set the position of the control decoration relative to the control.
+	 * It should include style bits describing both the vertical and horizontal orientation.
+	 *
+	 * @param decorationPositionOverride
+	 *            bit-wise or of position constants (<code>SWT.TOP</code>, <code>SWT.BOTTOM</code>, <code>SWT.LEFT</code>, <code>SWT.RIGHT</code>, and <code>SWT.CENTER</code>).
+	 *
+	 * @see ControlDecoration#ControlDecoration(Control, int)
+	 */
+	public void setDecorationPositionOverride(int decorationPositionOverride) {
+		this.decorationProvider.setDecorationPositionOverride(decorationPositionOverride);
+	}
+
+	/**
+	 * @return The {@link IEditErrorHandler} that is used for showing conversion errors on typing into
+	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 *         content in the editor red to indicate a conversion error.
+	 */
+	public IEditErrorHandler getInputConversionErrorHandler() {
+		return this.inputConversionErrorHandler;
+	}
+
+	/**
+	 * @param inputConversionErrorHandler
+	 *            The {@link IEditErrorHandler} that is should be used for showing
+	 *            conversion errors on typing into this editor.
+	 */
+	public void setInputConversionErrorHandler(IEditErrorHandler inputConversionErrorHandler) {
+		this.inputConversionErrorHandler = inputConversionErrorHandler;
+	}
+
+	/**
+	 * @return The {@link IEditErrorHandler} that is used for showing validation errors on typing into
+	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 *         content in the editor red to indicate a validation error.
+	 */
+	public IEditErrorHandler getInputValidationErrorHandler() {
+		return this.inputValidationErrorHandler;
+	}
+
+	/**
+	 * @param inputValidationErrorHandler
+	 *            The {@link IEditErrorHandler} that is should used for showing
+	 *            validation errors on typing into this editor.
+	 */
+	public void setInputValidationErrorHandler(IEditErrorHandler inputValidationErrorHandler) {
+		this.inputValidationErrorHandler = inputValidationErrorHandler;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
index a5e2aa34df0..d46096592e8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * 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.celleditor.config;

-

-import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-

-

-public abstract class AbstractCellEditorConfiguration implements IAxisCellEditorConfiguration {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDataValidator(Table, Object)

-	 *

-	 * @return

-	 *         <code>null</code>

-	 */

-	@Override

-	public IDataValidator getDataValidator(Table table, Object axisElement) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorDescription()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getEditorDescription() {

-		return "No Existing Description"; //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * 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.celleditor.config;
+
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+
+
+public abstract class AbstractCellEditorConfiguration implements IAxisCellEditorConfiguration {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDataValidator(Table, Object)
+	 *
+	 * @return
+	 *         <code>null</code>
+	 */
+	@Override
+	public IDataValidator getDataValidator(Table table, Object axisElement) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorDescription()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getEditorDescription() {
+		return "No Existing Description"; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
index 8ac0c7b2de0..dcb6d65e131 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
@@ -1,111 +1,111 @@
-/*****************************************************************************

- * 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.celleditor.config;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- *

- * The abstract class to used for CellEditorFactory

- *

- */

-public abstract class AbstractCellEditorConfigurationFactory {

-

-	/**

-	 * the id of the factory

-	 */

-	private String id;

-

-	/**

-	 * the id of the extension point used to register contribution

-	 */

-	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$

-

-	public static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

-

-	public static final String FACTORY_ID_ATTRIBUTE = "factoryId"; //$NON-NLS-1$

-

-	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @param id

-	 *            the id of the factory

-	 */

-	public void initFactory(String id) {

-		this.id = id;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the id of the factory

-	 */

-	public final String getFactoryId() {

-		return this.id;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the registered element for this factory

-	 */

-	public Collection<IConfigurationElement> getAllRegisteredCellEditorConfiguration() {

-		Collection<IConfigurationElement> elements = new ArrayList<IConfigurationElement>();

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		for (final IConfigurationElement iConfigurationElement : configElements) {

-			final String current = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

-			if (current.equals(this.id)) {

-				elements.add(iConfigurationElement);

-			}

-		}

-		return elements;

-	}

-

-	/**

-	 *

-	 * @param editorId

-	 *            the editor id

-	 * @return

-	 *         the configuration for this editor or <code>null</code> if the editor is not registered in this factory

-	 */

-	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(final String editorId);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            an eobject

-	 * @return

-	 *         <code>true</code> if this factory allows to edit the object for this table

-	 */

-	public abstract boolean handles(final Table table, final Object axisElement);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            an eobject

-	 * @return

-	 *         the cell editor configuration for the couple table - axisElement

-	 */

-	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(Table table, final Object axisElement);

-}

+/*****************************************************************************
+ * 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.celleditor.config;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ *
+ * The abstract class to used for CellEditorFactory
+ *
+ */
+public abstract class AbstractCellEditorConfigurationFactory {
+
+	/**
+	 * the id of the factory
+	 */
+	private String id;
+
+	/**
+	 * the id of the extension point used to register contribution
+	 */
+	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$
+
+	public static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+	public static final String FACTORY_ID_ATTRIBUTE = "factoryId"; //$NON-NLS-1$
+
+	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * @param id
+	 *            the id of the factory
+	 */
+	public void initFactory(String id) {
+		this.id = id;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the id of the factory
+	 */
+	public final String getFactoryId() {
+		return this.id;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the registered element for this factory
+	 */
+	public Collection<IConfigurationElement> getAllRegisteredCellEditorConfiguration() {
+		Collection<IConfigurationElement> elements = new ArrayList<IConfigurationElement>();
+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		for (final IConfigurationElement iConfigurationElement : configElements) {
+			final String current = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);
+			if (current.equals(this.id)) {
+				elements.add(iConfigurationElement);
+			}
+		}
+		return elements;
+	}
+
+	/**
+	 *
+	 * @param editorId
+	 *            the editor id
+	 * @return
+	 *         the configuration for this editor or <code>null</code> if the editor is not registered in this factory
+	 */
+	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(final String editorId);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            an eobject
+	 * @return
+	 *         <code>true</code> if this factory allows to edit the object for this table
+	 */
+	public abstract boolean handles(final Table table, final Object axisElement);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            an eobject
+	 * @return
+	 *         the cell editor configuration for the couple table - axisElement
+	 */
+	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(Table table, final Object axisElement);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
index 4f30cc60088..0defb7ecf30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
@@ -1,158 +1,158 @@
-/*****************************************************************************

- * Copyright (c) 2015, 2017 CEA LIST, Christian W. Damus, 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

- *   Christian W. Damus - bug 516309

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.celleditor.config;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * @author MA244259

- *

- */

-public class CellAxisConfigurationRegistry {

-

-	private List<ICellAxisConfiguration> registry;

-

-	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$

-

-	public static final String CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

-

-	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$

-

-	public static final CellAxisConfigurationRegistry INSTANCE = new CellAxisConfigurationRegistry();

-

-	// public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.papyrus.infra.nattable.celleditor";

-

-	public static final String CONFIGURATION_EXT_NEW = "cellAxisConfiguration";

-

-	/**

-	 *

-	 * Constructor.

-	 * Initial the registry of the configuration factories

-	 */

-	private CellAxisConfigurationRegistry() {

-		// to prevent instantiation

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		// final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME, EXTENSION_ID);

-		this.registry = new ArrayList<ICellAxisConfiguration>(configElements.length);

-		final Map<ICellAxisConfiguration, Integer> ordering = new HashMap<ICellAxisConfiguration, Integer>();

-		for (final IConfigurationElement iConfigurationElement : configElements) {

-			if (CONFIGURATION_EXT_NEW.equals(iConfigurationElement.getName())) {

-				// final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

-				final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));

-				try {

-					final ICellAxisConfiguration factory = (ICellAxisConfiguration) iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);

-					// factory.initFactory(id);

-

-					if (factory != null) {

-						ordering.put(factory, order);

-						this.registry.add(factory);

-					}

-				} catch (final CoreException e) {

-					Activator.log.error(e);

-				}

-			}

-		}

-

-		// Sort by ordering key

-		Collections.sort(this.registry, new Comparator<ICellAxisConfiguration>() {

-			@Override

-			public int compare(ICellAxisConfiguration o1, ICellAxisConfiguration o2) {

-				return ordering.get(o1) - ordering.get(o2);

-			}

-		});

-	}

-

-	/**

-	 *

-	 * @param configurationId

-	 *            the id of the factory

-	 * @return

-	 * 		the cellEditorFactory declared on this id or <code>null</code> if not found

-	 * 

-	 * 

-	 */

-	public ICellAxisConfiguration getCellEditorConfiguration(final String configurationId) {

-		Assert.isNotNull(configurationId);

-		for (final ICellAxisConfiguration current : this.registry) {

-			if (configurationId.equals(current.getConfigurationId())) {

-				return current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table for which we are looking for a cell editor factory

-	 * @param obj

-	 *            the object for which we are looking for a cell editor factory

-	 * @return

-	 * 		the first cell editor configuration factory which is able to manage this object

-	 */

-	public ICellAxisConfiguration getFirstCellEditorConfiguration(final Table table, final Object obj) {

-		final List<ICellAxisConfiguration> configurations = getCellEditorConfigurationFactories(table, obj);

-		if (!configurations.isEmpty()) {

-			return configurations.get(0);

-		}

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager for which we are looking for a cell editor factory

-	 * @param obj

-	 *            the object for which we are looking for a cell editor factory

-	 * @return

-	 * 		the first cell editor configuration factory which is able to manage this object

-	 */

-	public ICellAxisConfiguration getFirstCellEditorConfiguration(final INattableModelManager tableManager, final Object obj) {

-		return getFirstCellEditorConfiguration(tableManager.getTable(), obj);

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table for which we are looking for a cell editor factory

-	 * @param obj

-	 *            the object for which we are looking for a cell editor factory

-	 * @return

-	 * 		the list of the cell editor configuration which are able to manage this object

-	 */

-	public List<ICellAxisConfiguration> getCellEditorConfigurationFactories(final Table table, final Object obj) {

-		final List<ICellAxisConfiguration> factories = new ArrayList<ICellAxisConfiguration>();

-		for (final ICellAxisConfiguration current : this.registry) {

-			if (current.handles(table, obj)) {

-				factories.add(current);

-			}

-		}

-		return factories;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015, 2017 CEA LIST, Christian W. Damus, 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
+ *   Christian W. Damus - bug 516309
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.celleditor.config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.emf.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * @author MA244259
+ *
+ */
+public class CellAxisConfigurationRegistry {
+
+	private List<ICellAxisConfiguration> registry;
+
+	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$
+
+	public static final String CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$
+
+	public static final CellAxisConfigurationRegistry INSTANCE = new CellAxisConfigurationRegistry();
+
+	// public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.papyrus.infra.nattable.celleditor";
+
+	public static final String CONFIGURATION_EXT_NEW = "cellAxisConfiguration";
+
+	/**
+	 *
+	 * Constructor.
+	 * Initial the registry of the configuration factories
+	 */
+	private CellAxisConfigurationRegistry() {
+		// to prevent instantiation
+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		// final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME, EXTENSION_ID);
+		this.registry = new ArrayList<ICellAxisConfiguration>(configElements.length);
+		final Map<ICellAxisConfiguration, Integer> ordering = new HashMap<ICellAxisConfiguration, Integer>();
+		for (final IConfigurationElement iConfigurationElement : configElements) {
+			if (CONFIGURATION_EXT_NEW.equals(iConfigurationElement.getName())) {
+				// final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);
+				final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));
+				try {
+					final ICellAxisConfiguration factory = (ICellAxisConfiguration) iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);
+					// factory.initFactory(id);
+
+					if (factory != null) {
+						ordering.put(factory, order);
+						this.registry.add(factory);
+					}
+				} catch (final CoreException e) {
+					Activator.log.error(e);
+				}
+			}
+		}
+
+		// Sort by ordering key
+		Collections.sort(this.registry, new Comparator<ICellAxisConfiguration>() {
+			@Override
+			public int compare(ICellAxisConfiguration o1, ICellAxisConfiguration o2) {
+				return ordering.get(o1) - ordering.get(o2);
+			}
+		});
+	}
+
+	/**
+	 *
+	 * @param configurationId
+	 *            the id of the factory
+	 * @return
+	 * 		the cellEditorFactory declared on this id or <code>null</code> if not found
+	 * 
+	 * 
+	 */
+	public ICellAxisConfiguration getCellEditorConfiguration(final String configurationId) {
+		Assert.isNotNull(configurationId);
+		for (final ICellAxisConfiguration current : this.registry) {
+			if (configurationId.equals(current.getConfigurationId())) {
+				return current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table for which we are looking for a cell editor factory
+	 * @param obj
+	 *            the object for which we are looking for a cell editor factory
+	 * @return
+	 * 		the first cell editor configuration factory which is able to manage this object
+	 */
+	public ICellAxisConfiguration getFirstCellEditorConfiguration(final Table table, final Object obj) {
+		final List<ICellAxisConfiguration> configurations = getCellEditorConfigurationFactories(table, obj);
+		if (!configurations.isEmpty()) {
+			return configurations.get(0);
+		}
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager for which we are looking for a cell editor factory
+	 * @param obj
+	 *            the object for which we are looking for a cell editor factory
+	 * @return
+	 * 		the first cell editor configuration factory which is able to manage this object
+	 */
+	public ICellAxisConfiguration getFirstCellEditorConfiguration(final INattableModelManager tableManager, final Object obj) {
+		return getFirstCellEditorConfiguration(tableManager.getTable(), obj);
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table for which we are looking for a cell editor factory
+	 * @param obj
+	 *            the object for which we are looking for a cell editor factory
+	 * @return
+	 * 		the list of the cell editor configuration which are able to manage this object
+	 */
+	public List<ICellAxisConfiguration> getCellEditorConfigurationFactories(final Table table, final Object obj) {
+		final List<ICellAxisConfiguration> factories = new ArrayList<ICellAxisConfiguration>();
+		for (final ICellAxisConfiguration current : this.registry) {
+			if (current.handles(table, obj)) {
+				factories.add(current);
+			}
+		}
+		return factories;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
index 2425a64f6ab..96f0bc86cbb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

- * 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.celleditor.config;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- *

- * This interface declares the methods used to get the element for the configuration of celleditors when they are declared by axis

- *

- */

-public interface IAxisCellEditorConfiguration {

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @param provider

-	 *            the label provider to use

-	 * @return

-	 *         the display converter

-	 */

-	public IDisplayConverter getDisplayConvert(Table table, Object axisElement, final ILabelProvider provider);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @return

-	 *         the cell painter for the editor

-	 */

-	public ICellPainter getCellPainter(Table table, Object axisElement);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the edited element axis

-	 * @param elementProvider

-	 * @return

-	 */

-	public ICellEditor getICellEditor(Table table, Object axisElement, ITableAxisElementProvider elementProvider);

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @return

-	 *         the display mode to use for the editor

-	 */

-	public String getDisplayMode(Table table, Object axisElement);

-

-	/**

-	 *

-	 * @return

-	 *         the id of the editor

-	 */

-	public String getEditorConfigId();

-

-	/**

-	 *

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @return the data validator

-	 */

-	public IDataValidator getDataValidator(Table table, Object axisElement);

-

-	/**

-	 *

-	 * @return

-	 *         the description for the editor (should be used by the preferences)

-	 */

-	public String getEditorDescription();

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param object

-	 *            an object

-	 * @return

-	 *         <code>true</code> if the cell editor configuration is able to manage the object

-	 */

-	public boolean handles(Table table, Object object);

-}

+/*****************************************************************************
+ * 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.celleditor.config;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ *
+ * This interface declares the methods used to get the element for the configuration of celleditors when they are declared by axis
+ *
+ */
+public interface IAxisCellEditorConfiguration {
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @param provider
+	 *            the label provider to use
+	 * @return
+	 *         the display converter
+	 */
+	public IDisplayConverter getDisplayConvert(Table table, Object axisElement, final ILabelProvider provider);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @return
+	 *         the cell painter for the editor
+	 */
+	public ICellPainter getCellPainter(Table table, Object axisElement);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the edited element axis
+	 * @param elementProvider
+	 * @return
+	 */
+	public ICellEditor getICellEditor(Table table, Object axisElement, ITableAxisElementProvider elementProvider);
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @return
+	 *         the display mode to use for the editor
+	 */
+	public String getDisplayMode(Table table, Object axisElement);
+
+	/**
+	 *
+	 * @return
+	 *         the id of the editor
+	 */
+	public String getEditorConfigId();
+
+	/**
+	 *
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @return the data validator
+	 */
+	public IDataValidator getDataValidator(Table table, Object axisElement);
+
+	/**
+	 *
+	 * @return
+	 *         the description for the editor (should be used by the preferences)
+	 */
+	public String getEditorDescription();
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param object
+	 *            an object
+	 * @return
+	 *         <code>true</code> if the cell editor configuration is able to manage the object
+	 */
+	public boolean handles(Table table, Object object);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
index 9b11dc6aa1c..b287f42cde0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * 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.celleditor.config;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- *

- * A specific interface to declare editor on specific EStructuralFeature

- *

- * @deprecated because never used, since Papyrus 1.1.0

- */

-@Deprecated

-public interface IAxisEStructuralFeatureCellEditorConfiguration extends IAxisCellEditorConfiguration {

-

-	/**

-	 *

-	 * @return

-	 *         the edited feature

-	 */

-	public Collection<EStructuralFeature> getEditedFeature();

-}

+/*****************************************************************************
+ * 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.celleditor.config;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ *
+ * A specific interface to declare editor on specific EStructuralFeature
+ *
+ * @deprecated because never used, since Papyrus 1.1.0
+ */
+@Deprecated
+public interface IAxisEStructuralFeatureCellEditorConfiguration extends IAxisCellEditorConfiguration {
+
+	/**
+	 *
+	 * @return
+	 *         the edited feature
+	 */
+	public Collection<EStructuralFeature> getEditedFeature();
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
index 362c2b086c3..bd0c82b3fc3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * 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.nattable.celleditor.config;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * @author MA244259

- *

- */

-public interface ICellAxisConfiguration extends IPapyrusNatTableConfiguration{

-

-	/**

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	boolean handles(Table table, Object axisElement);

-

-	/**

-	 * @param configRegistry

-	 * @param axis

-	 * @param configLabel

-	 */

-	void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel);

-

-}

+/*****************************************************************************
+ * 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.nattable.celleditor.config;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * @author MA244259
+ *
+ */
+public interface ICellAxisConfiguration extends IPapyrusNatTableConfiguration{
+
+	/**
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	boolean handles(Table table, Object axisElement);
+
+	/**
+	 * @param configRegistry
+	 * @param axis
+	 * @param configLabel
+	 */
+	void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
index 2b6ffeb1e21..e77afef60d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
@@ -1,431 +1,431 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2017 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

- *  Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 527734

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.command;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-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.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * This class provides some useful commands used to edit the table properties

- *

- * @author Vincent Lorenzo

- *

- */

-public class TableCommands {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private TableCommands() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param feature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to change a value in the row configuration header of a table

-	 */

-	// TODO : the handler must use me

-	public static ICommand getSetRowHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final CompositeCommand compositeCommand = new CompositeCommand("SetRowHeaderConfigurationCommand"); //$NON-NLS-1$

-		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);

-		if (elementToEdit instanceof TableHeaderAxisConfiguration) {

-			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);

-			SetRequest request = null;

-			if (!table.isInvertAxis()) {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);

-			} else {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);

-			}

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			final ICommand cmd = provider.getEditCommand(request);

-			compositeCommand.add(cmd);

-		}

-		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);

-		final ICommand cmd = provider.getEditCommand(request);

-		compositeCommand.add(cmd);

-		return compositeCommand;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param feature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to change a value in the column configuration header of a table

-	 */

-	// TODO : the handler must use me

-	public static ICommand getSetColumnHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final CompositeCommand compositeCommand = new CompositeCommand("SetColumnHeaderConfigurationCommand"); //$NON-NLS-1$

-		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);

-		if (elementToEdit instanceof TableHeaderAxisConfiguration) {

-			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);

-			SetRequest request = null;

-			if (table.isInvertAxis()) {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);

-			} else {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);

-			}

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			final ICommand cmd = provider.getEditCommand(request);

-			compositeCommand.add(cmd);

-		}

-		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);

-		final ICommand cmd = provider.getEditCommand(request);

-		compositeCommand.add(cmd);

-		return compositeCommand;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param usedLabelConfiguration

-	 *            the used label configuration

-	 * @param editedFeature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it

-	 *         is required

-	 */

-	// TODO the handler must use me

-	public static final ICommand getSetColumnLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {

-		final CompositeCommand cmd = new CompositeCommand("ChangeColumnLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		ILabelProviderConfiguration editedLabelConf;

-		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);

-			cmd.add(getRegisterLocalColumnLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));

-		} else {

-			editedLabelConf = usedLabelConfiguration;

-		}

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param usedLabelConfiguration

-	 *            the used label configuration

-	 * @param editedFeature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it

-	 *         is required

-	 */

-	// TODO the handler must use me

-	public static final ICommand getSetRowLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {

-		final CompositeCommand cmd = new CompositeCommand("ChangeRowLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		ILabelProviderConfiguration editedLabelConf;

-		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);

-			cmd.add(getRegisterLocalRowLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));

-		} else {

-			editedLabelConf = usedLabelConfiguration;

-		}

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		return cmd;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param tableLabelConfiguration

-	 *            the table LabelConfiguration

-	 * @param localTableLabelConfiguration

-	 *            the local table label configuration

-	 * @return

-	 *         the command to register the local column label configuration to the table

-	 */

-	private static final ICommand getRegisterLocalColumnLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {

-		final AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);

-

-		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		}

-

-		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-		return getRegisterLocalLabelConfigurationCommand("ChangeColumnHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param tableLabelConfiguration

-	 *            the table LabelConfiguration

-	 * @param localTableLabelConfiguration

-	 *            the local table label configuration

-	 * @return

-	 *         the command to register the local row label configuration to the table

-	 */

-	private static final ICommand getRegisterLocalRowLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {

-		AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);

-

-		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-

-		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		return getRegisterLocalLabelConfigurationCommand("ChangeRowHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$

-	}

-

-	/**

-	 *

-	 * @param commandName

-	 *            the name of the command

-	 * @param table

-	 *            the table to edit

-	 * @param headerAxisConfigurationUsedInTable

-	 *            the headerAxisConfiguration currently used in the table

-	 * @param tableHeaderAxisConfiguration

-	 *            the table header axis configuration defined in the table configuration

-	 * @param axisConfigurationFeature

-	 *            the feature to use to register a local HeaderAxisConfiguration if it is required

-	 * @param localTableLabelConfiguration

-	 *            the local table label configuration to register

-	 * @param tableLabelConfiguration

-	 *            the table label configuration

-	 * @return

-	 *         the command to register the local label configuration

-	 */

-	private static final ICommand getRegisterLocalLabelConfigurationCommand(final String commandName, final Table table, final AbstractHeaderAxisConfiguration headerAxisConfigurationUsedInTable, final TableHeaderAxisConfiguration tableHeaderAxisConfiguration,

-			final EStructuralFeature axisConfigurationFeature, final ILabelProviderConfiguration localTableLabelConfiguration, final ILabelProviderConfiguration tableLabelConfiguration) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final CompositeCommand cmd = new CompositeCommand(commandName);

-

-		// 1. we must get or create the required LocalTableHeaderAxisConfiguration

-		LocalTableHeaderAxisConfiguration localConfig = null;

-		if (headerAxisConfigurationUsedInTable instanceof LocalTableHeaderAxisConfiguration) {

-			localConfig = (LocalTableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable;

-		} else if (headerAxisConfigurationUsedInTable instanceof TableHeaderAxisConfiguration) {

-			// we can't edit it, because it's comes from the initial configuration

-			localConfig = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable);

-			final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, localConfig);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			cmd.add(provider.getEditCommand(request));

-		}

-

-		// 2. this one must store the new label configuration

-		final IEditCommandRequest request = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(localConfig);

-		cmd.add(provider.getEditCommand(request));

-

-		// 3. we must get or create the AxisManagerConfiguration(s)

-		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();

-		for (final AxisManagerRepresentation current : tableHeaderAxisConfiguration.getAxisManagers()) {

-			// we look for defined axis manager which uses the labelconfiguration defined in the table config

-			if (current.getHeaderLabelConfiguration() == tableLabelConfiguration) {

-				AxisManagerConfiguration currentConf = null;

-				// we look for an axis manager configuration mapped in this axis manager representation

-				for (final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {

-					if (axisConf.getAxisManager() == current) {

-						currentConf = axisConf;

-					}

-				}

-				if (currentConf == null) {

-					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();

-					currentConf.setAxisManager(current);

-					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);

-					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);

-					cmd.add(provider2.getEditCommand(request2));

-				}

-				axisManagerConfiguration.add(currentConf);

-			}

-		}

-

-		// 4. these one must reference the LabelConfiguration

-		for (final AxisManagerConfiguration current : axisManagerConfiguration) {

-			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);

-			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);

-			cmd.add(provider2.getEditCommand(request2));

-		}

-		return cmd;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 * @param localHeaderAxisConfiguration

-	 * @param column

-	 * @return

-	 *         the command to register the local table configuration into the table

-	 */

-	private static final ICommand getRegisterLocalHeaderAxisConfigurationCommand(final Table table, final LocalTableHeaderAxisConfiguration localHeaderAxisConfiguration, final boolean workOnColumn) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final EStructuralFeature feature;

-		if (registerOnColumn(table, workOnColumn)) {

-			feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		} else {

-			feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		}

-		final SetRequest request = new SetRequest(domain, table, feature, localHeaderAxisConfiguration);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-		return provider.getEditCommand(request);

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param configurationToAdd

-	 *            the configuration to add

-	 * @param onColumn

-	 *            boolean indicating if the user is editing dislpayed column or displayed row

-	 * @return

-	 *         the command to add the axis configuration to the table

-	 */

-	private static final ICommand getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(final Table table, final IAxisConfiguration configurationToAdd, final boolean onColumn) {

-		final CompositeCommand compositeCommand = new CompositeCommand("Add IAxis Configuration to table header"); //$NON-NLS-1$

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-

-		// 1.we look for an existing local headerAxisConfigruation on the table

-		AbstractHeaderAxisConfiguration headerAxisConfiguration = null;

-		if (registerOnColumn(table, onColumn)) {

-			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);

-		} else {

-			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);

-		}

-

-		// 2. if the local header axis doen't exist we create and register it

-		if (headerAxisConfiguration == null) {

-			final TableHeaderAxisConfiguration tableHeaderAxisConfiguration;

-			final EStructuralFeature feature;

-			if (registerOnColumn(table, onColumn)) {

-				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-				feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-			} else {

-				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-				feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-			}

-			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration(tableHeaderAxisConfiguration);

-			final SetRequest request = new SetRequest(domain, table, feature, headerAxisConfiguration);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			compositeCommand.add(provider.getEditCommand(request));

-		}

-

-		// 3. we register the axis configuration to the local table header axis

-		final SetRequest request = new SetRequest(domain, headerAxisConfiguration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), configurationToAdd);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(headerAxisConfiguration);

-		compositeCommand.add(provider.getEditCommand(request));

-		return compositeCommand;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param workOnColumn

-	 *            a boolean indication if the user is work on displayed columns or on displayed row

-	 * @return

-	 *         <code>true</code> if the operations must be done on column and false if the operations must be done on rows

-	 */

-	private static final boolean registerOnColumn(final Table table, final boolean workOnColumn) {

-		return workOnColumn || (!workOnColumn && table.isInvertAxis());

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param editedConfiguration

-	 *            the edited configuration

-	 * @param managedFeature

-	 *            the managed feature

-	 * @param value

-	 *            the new value for this feature

-	 * @param onColumn

-	 *            <code>true</code> if we are working on column

-	 * @return

-	 *         the command doing the set value

-	 */

-	public static ICommand getSetIAxisConfigurationValueCommand(final Table table, final IAxisConfiguration editedConfiguration, final EStructuralFeature managedFeature, final Object value, boolean onColumn) {

-		final CompositeCommand compositeCommand = new CompositeCommand("Set IAxis Value Command"); //$NON-NLS-1$

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final EObject parent = editedConfiguration.eContainer();

-		IAxisConfiguration realEditedObject = editedConfiguration;

-		// the current configuration doesn't exist in the instance of the table, we must add it

-		if (parent == null) {

-			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, editedConfiguration, onColumn));

-		} else if (parent instanceof TableHeaderAxisConfiguration) {

-			realEditedObject = EcoreUtil.copy(editedConfiguration);

-			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, realEditedObject, onColumn));

-		}

-		final SetRequest request = new SetRequest(domain, realEditedObject, managedFeature, value);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(realEditedObject);

-		compositeCommand.add(provider.getEditCommand(request));

-		return compositeCommand;

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2017 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
+ *  Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 527734
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.command;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+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.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * This class provides some useful commands used to edit the table properties
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TableCommands {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private TableCommands() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param feature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to change a value in the row configuration header of a table
+	 */
+	// TODO : the handler must use me
+	public static ICommand getSetRowHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final CompositeCommand compositeCommand = new CompositeCommand("SetRowHeaderConfigurationCommand"); //$NON-NLS-1$
+		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);
+		if (elementToEdit instanceof TableHeaderAxisConfiguration) {
+			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);
+			SetRequest request = null;
+			if (!table.isInvertAxis()) {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);
+			} else {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);
+			}
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			final ICommand cmd = provider.getEditCommand(request);
+			compositeCommand.add(cmd);
+		}
+		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);
+		final ICommand cmd = provider.getEditCommand(request);
+		compositeCommand.add(cmd);
+		return compositeCommand;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param feature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to change a value in the column configuration header of a table
+	 */
+	// TODO : the handler must use me
+	public static ICommand getSetColumnHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final CompositeCommand compositeCommand = new CompositeCommand("SetColumnHeaderConfigurationCommand"); //$NON-NLS-1$
+		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);
+		if (elementToEdit instanceof TableHeaderAxisConfiguration) {
+			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);
+			SetRequest request = null;
+			if (table.isInvertAxis()) {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);
+			} else {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);
+			}
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			final ICommand cmd = provider.getEditCommand(request);
+			compositeCommand.add(cmd);
+		}
+		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);
+		final ICommand cmd = provider.getEditCommand(request);
+		compositeCommand.add(cmd);
+		return compositeCommand;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param usedLabelConfiguration
+	 *            the used label configuration
+	 * @param editedFeature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it
+	 *         is required
+	 */
+	// TODO the handler must use me
+	public static final ICommand getSetColumnLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {
+		final CompositeCommand cmd = new CompositeCommand("ChangeColumnLabelConfigurationValueCommand"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		ILabelProviderConfiguration editedLabelConf;
+		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {
+			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);
+			cmd.add(getRegisterLocalColumnLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));
+		} else {
+			editedLabelConf = usedLabelConfiguration;
+		}
+		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);
+		cmd.add(provider.getEditCommand(request));
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param usedLabelConfiguration
+	 *            the used label configuration
+	 * @param editedFeature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it
+	 *         is required
+	 */
+	// TODO the handler must use me
+	public static final ICommand getSetRowLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {
+		final CompositeCommand cmd = new CompositeCommand("ChangeRowLabelConfigurationValueCommand"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		ILabelProviderConfiguration editedLabelConf;
+		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {
+			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);
+			cmd.add(getRegisterLocalRowLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));
+		} else {
+			editedLabelConf = usedLabelConfiguration;
+		}
+		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);
+		cmd.add(provider.getEditCommand(request));
+		return cmd;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param tableLabelConfiguration
+	 *            the table LabelConfiguration
+	 * @param localTableLabelConfiguration
+	 *            the local table label configuration
+	 * @return
+	 *         the command to register the local column label configuration to the table
+	 */
+	private static final ICommand getRegisterLocalColumnLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {
+		final AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);
+
+		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+		}
+
+		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+		return getRegisterLocalLabelConfigurationCommand("ChangeColumnHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param tableLabelConfiguration
+	 *            the table LabelConfiguration
+	 * @param localTableLabelConfiguration
+	 *            the local table label configuration
+	 * @return
+	 *         the command to register the local row label configuration to the table
+	 */
+	private static final ICommand getRegisterLocalRowLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {
+		AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);
+
+		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+
+		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+		return getRegisterLocalLabelConfigurationCommand("ChangeRowHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$
+	}
+
+	/**
+	 *
+	 * @param commandName
+	 *            the name of the command
+	 * @param table
+	 *            the table to edit
+	 * @param headerAxisConfigurationUsedInTable
+	 *            the headerAxisConfiguration currently used in the table
+	 * @param tableHeaderAxisConfiguration
+	 *            the table header axis configuration defined in the table configuration
+	 * @param axisConfigurationFeature
+	 *            the feature to use to register a local HeaderAxisConfiguration if it is required
+	 * @param localTableLabelConfiguration
+	 *            the local table label configuration to register
+	 * @param tableLabelConfiguration
+	 *            the table label configuration
+	 * @return
+	 *         the command to register the local label configuration
+	 */
+	private static final ICommand getRegisterLocalLabelConfigurationCommand(final String commandName, final Table table, final AbstractHeaderAxisConfiguration headerAxisConfigurationUsedInTable, final TableHeaderAxisConfiguration tableHeaderAxisConfiguration,
+			final EStructuralFeature axisConfigurationFeature, final ILabelProviderConfiguration localTableLabelConfiguration, final ILabelProviderConfiguration tableLabelConfiguration) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final CompositeCommand cmd = new CompositeCommand(commandName);
+
+		// 1. we must get or create the required LocalTableHeaderAxisConfiguration
+		LocalTableHeaderAxisConfiguration localConfig = null;
+		if (headerAxisConfigurationUsedInTable instanceof LocalTableHeaderAxisConfiguration) {
+			localConfig = (LocalTableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable;
+		} else if (headerAxisConfigurationUsedInTable instanceof TableHeaderAxisConfiguration) {
+			// we can't edit it, because it's comes from the initial configuration
+			localConfig = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable);
+			final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, localConfig);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			cmd.add(provider.getEditCommand(request));
+		}
+
+		// 2. this one must store the new label configuration
+		final IEditCommandRequest request = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(localConfig);
+		cmd.add(provider.getEditCommand(request));
+
+		// 3. we must get or create the AxisManagerConfiguration(s)
+		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();
+		for (final AxisManagerRepresentation current : tableHeaderAxisConfiguration.getAxisManagers()) {
+			// we look for defined axis manager which uses the labelconfiguration defined in the table config
+			if (current.getHeaderLabelConfiguration() == tableLabelConfiguration) {
+				AxisManagerConfiguration currentConf = null;
+				// we look for an axis manager configuration mapped in this axis manager representation
+				for (final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {
+					if (axisConf.getAxisManager() == current) {
+						currentConf = axisConf;
+					}
+				}
+				if (currentConf == null) {
+					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();
+					currentConf.setAxisManager(current);
+					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);
+					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);
+					cmd.add(provider2.getEditCommand(request2));
+				}
+				axisManagerConfiguration.add(currentConf);
+			}
+		}
+
+		// 4. these one must reference the LabelConfiguration
+		for (final AxisManagerConfiguration current : axisManagerConfiguration) {
+			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);
+			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);
+			cmd.add(provider2.getEditCommand(request2));
+		}
+		return cmd;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 * @param localHeaderAxisConfiguration
+	 * @param column
+	 * @return
+	 *         the command to register the local table configuration into the table
+	 */
+	private static final ICommand getRegisterLocalHeaderAxisConfigurationCommand(final Table table, final LocalTableHeaderAxisConfiguration localHeaderAxisConfiguration, final boolean workOnColumn) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final EStructuralFeature feature;
+		if (registerOnColumn(table, workOnColumn)) {
+			feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		} else {
+			feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+		}
+		final SetRequest request = new SetRequest(domain, table, feature, localHeaderAxisConfiguration);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+		return provider.getEditCommand(request);
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param configurationToAdd
+	 *            the configuration to add
+	 * @param onColumn
+	 *            boolean indicating if the user is editing dislpayed column or displayed row
+	 * @return
+	 *         the command to add the axis configuration to the table
+	 */
+	private static final ICommand getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(final Table table, final IAxisConfiguration configurationToAdd, final boolean onColumn) {
+		final CompositeCommand compositeCommand = new CompositeCommand("Add IAxis Configuration to table header"); //$NON-NLS-1$
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+
+		// 1.we look for an existing local headerAxisConfigruation on the table
+		AbstractHeaderAxisConfiguration headerAxisConfiguration = null;
+		if (registerOnColumn(table, onColumn)) {
+			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);
+		} else {
+			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);
+		}
+
+		// 2. if the local header axis doen't exist we create and register it
+		if (headerAxisConfiguration == null) {
+			final TableHeaderAxisConfiguration tableHeaderAxisConfiguration;
+			final EStructuralFeature feature;
+			if (registerOnColumn(table, onColumn)) {
+				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+				feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+			} else {
+				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+				feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+			}
+			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration(tableHeaderAxisConfiguration);
+			final SetRequest request = new SetRequest(domain, table, feature, headerAxisConfiguration);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			compositeCommand.add(provider.getEditCommand(request));
+		}
+
+		// 3. we register the axis configuration to the local table header axis
+		final SetRequest request = new SetRequest(domain, headerAxisConfiguration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), configurationToAdd);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(headerAxisConfiguration);
+		compositeCommand.add(provider.getEditCommand(request));
+		return compositeCommand;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param workOnColumn
+	 *            a boolean indication if the user is work on displayed columns or on displayed row
+	 * @return
+	 *         <code>true</code> if the operations must be done on column and false if the operations must be done on rows
+	 */
+	private static final boolean registerOnColumn(final Table table, final boolean workOnColumn) {
+		return workOnColumn || (!workOnColumn && table.isInvertAxis());
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param editedConfiguration
+	 *            the edited configuration
+	 * @param managedFeature
+	 *            the managed feature
+	 * @param value
+	 *            the new value for this feature
+	 * @param onColumn
+	 *            <code>true</code> if we are working on column
+	 * @return
+	 *         the command doing the set value
+	 */
+	public static ICommand getSetIAxisConfigurationValueCommand(final Table table, final IAxisConfiguration editedConfiguration, final EStructuralFeature managedFeature, final Object value, boolean onColumn) {
+		final CompositeCommand compositeCommand = new CompositeCommand("Set IAxis Value Command"); //$NON-NLS-1$
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final EObject parent = editedConfiguration.eContainer();
+		IAxisConfiguration realEditedObject = editedConfiguration;
+		// the current configuration doesn't exist in the instance of the table, we must add it
+		if (parent == null) {
+			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, editedConfiguration, onColumn));
+		} else if (parent instanceof TableHeaderAxisConfiguration) {
+			realEditedObject = EcoreUtil.copy(editedConfiguration);
+			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, realEditedObject, onColumn));
+		}
+		final SetRequest request = new SetRequest(domain, realEditedObject, managedFeature, value);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(realEditedObject);
+		compositeCommand.add(provider.getEditCommand(request));
+		return compositeCommand;
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java
index 40ac8e24915..9669c824990 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * 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.comparator;

-

-import java.util.Comparator;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * Abstract class for axis comparator

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractAxisComparator implements Comparator<Object> {

-

-	/**

-	 * the table manager

-	 */

-	protected final INattableModelManager tableManager;

-

-	/**

-	 * the sort direction

-	 */

-	protected final SortDirectionEnum direction;

-

-	/**

-	 * the label provider service

-	 */

-	protected final LabelProviderService serv;

-

-	/**

-	 * the body layer stack

-	 */

-	protected final BodyLayerStack stack;

-

-	/**

-	 * the config registry

-	 */

-	protected final IConfigRegistry configRegistry;

-

-	/**

-	 * the selected column object

-	 */

-	protected final Object selectedColumn;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selectedColumn

-	 * @param direction

-	 * @param tableManager

-	 */

-	public AbstractAxisComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {

-		this.configRegistry = ((NatTable) ((IAdaptable) tableManager).getAdapter(NatTable.class)).getConfigRegistry();

-		this.tableManager = tableManager;

-		this.direction = direction;

-		this.selectedColumn = selectedColumn;

-		this.serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		this.stack = tableManager.getBodyLayerStack();

-	}

-}

+/*****************************************************************************
+ * 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.comparator;
+
+import java.util.Comparator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+/**
+ * Abstract class for axis comparator
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractAxisComparator implements Comparator<Object> {
+
+	/**
+	 * the table manager
+	 */
+	protected final INattableModelManager tableManager;
+
+	/**
+	 * the sort direction
+	 */
+	protected final SortDirectionEnum direction;
+
+	/**
+	 * the label provider service
+	 */
+	protected final LabelProviderService serv;
+
+	/**
+	 * the body layer stack
+	 */
+	protected final BodyLayerStack stack;
+
+	/**
+	 * the config registry
+	 */
+	protected final IConfigRegistry configRegistry;
+
+	/**
+	 * the selected column object
+	 */
+	protected final Object selectedColumn;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selectedColumn
+	 * @param direction
+	 * @param tableManager
+	 */
+	public AbstractAxisComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {
+		this.configRegistry = ((NatTable) ((IAdaptable) tableManager).getAdapter(NatTable.class)).getConfigRegistry();
+		this.tableManager = tableManager;
+		this.direction = direction;
+		this.selectedColumn = selectedColumn;
+		this.serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		this.stack = tableManager.getBodyLayerStack();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
index 48f20426a4e..84f6ddf282c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * 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.nattable.comparator;

-

-import java.math.BigDecimal;

-import java.util.Comparator;

-

-import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;

-import org.eclipse.papyrus.infra.tools.util.TypeUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class DoubleFilterComparator implements Comparator<Object> {

-

-	private static DoubleFilterComparator singleton;

-

-	/**

-	 * 

-	 * @return

-	 */

-	public static final DoubleFilterComparator getInstance() {

-		if (singleton == null) {

-			singleton = new DoubleFilterComparator();

-		}

-		return singleton;

-	}

-

-	/**

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 *

-	 * @param o1

-	 * @param o2

-	 * @return

-	 */

-	@Override

-	public int compare(Object o1, Object o2) {

-		if (o1 instanceof Double && o2 instanceof Double) {

-			Double d1 = (Double) o1;

-			Double d2 = (Double) o2;

-			return d1.compareTo(d2);

-		}

-		if (!(o1 instanceof Double)) {

-			return FilterPreferences.INCONSISTENT_VALUE;

-		}

-		// o1 is the cell value and o2 the value to match

-		if (o1 instanceof Double) {

-			Double d1 = (Double) o1;

-			Double d2 = null;

-			if (o2 instanceof Double) {

-				if (TypeUtils.isDoubleValue(o2.toString())) {

-					// big decimal to avoid to get comma as separator instead of dot

-					d2 = new BigDecimal(o2.toString()).doubleValue();

-					return d1.compareTo(d2);

-				}

-				return FilterPreferences.INCONSISTENT_VALUE;

-			}

-		}

-		return FilterPreferences.INCONSISTENT_VALUE;

-	}

-

-}

+/*****************************************************************************
+ * 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.nattable.comparator;
+
+import java.math.BigDecimal;
+import java.util.Comparator;
+
+import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class DoubleFilterComparator implements Comparator<Object> {
+
+	private static DoubleFilterComparator singleton;
+
+	/**
+	 * 
+	 * @return
+	 */
+	public static final DoubleFilterComparator getInstance() {
+		if (singleton == null) {
+			singleton = new DoubleFilterComparator();
+		}
+		return singleton;
+	}
+
+	/**
+	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+	 *
+	 * @param o1
+	 * @param o2
+	 * @return
+	 */
+	@Override
+	public int compare(Object o1, Object o2) {
+		if (o1 instanceof Double && o2 instanceof Double) {
+			Double d1 = (Double) o1;
+			Double d2 = (Double) o2;
+			return d1.compareTo(d2);
+		}
+		if (!(o1 instanceof Double)) {
+			return FilterPreferences.INCONSISTENT_VALUE;
+		}
+		// o1 is the cell value and o2 the value to match
+		if (o1 instanceof Double) {
+			Double d1 = (Double) o1;
+			Double d2 = null;
+			if (o2 instanceof Double) {
+				if (TypeUtils.isDoubleValue(o2.toString())) {
+					// big decimal to avoid to get comma as separator instead of dot
+					d2 = new BigDecimal(o2.toString()).doubleValue();
+					return d1.compareTo(d2);
+				}
+				return FilterPreferences.INCONSISTENT_VALUE;
+			}
+		}
+		return FilterPreferences.INCONSISTENT_VALUE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java
index d7893d18ea2..67c4336e96d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * 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.comparator;

-

-import java.text.Collator;

-

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-

-/**

- * Axis Comparator used to sort the rows according to the selected column

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowComparator extends AbstractAxisComparator {

-

-	private LabelProviderCellContextElementWrapper wrapper1;

-

-	private LabelProviderCellContextElementWrapper wrapper2;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selectedColumn

-	 *            the selected column

-	 * @param direction

-	 *            the direction to do the sort

-	 * @param tableManager

-	 *            the table manager

-	 */

-	public RowComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {

-		super(selectedColumn, direction, tableManager);

-		wrapper1 = new LabelProviderCellContextElementWrapper();

-		wrapper2 = new LabelProviderCellContextElementWrapper();

-		wrapper1.setConfigRegistry(configRegistry);

-		wrapper2.setConfigRegistry(configRegistry);

-	}

-

-	/**

-	 *

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 *

-	 * @param o1

-	 * @param o2

-	 * @return

-	 */

-	@Override

-	public int compare(final Object o1, final Object o2) {

-		int index_01 = tableManager.getRowElementsList().indexOf(o1);

-		int index_02 = tableManager.getRowElementsList().indexOf(o2);

-		int columnIndex = tableManager.getColumnElementsList().indexOf(selectedColumn);

-		if (columnIndex == -1) {

-			return 0;

-		}

-		final ILayerCell cell_O1 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_01);

-		final ILayerCell cell_O2 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_02);

-

-		wrapper1.setCell(cell_O1);

-		wrapper1.setObject(cell_O1.getDataValue());

-		wrapper2.setCell(cell_O2);

-		wrapper2.setObject(cell_O2.getDataValue());

-		final String txt1 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper1);

-		final String txt2 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper2);

-		final int res;

-		if (direction == SortDirectionEnum.DESC) {

-			res = Collator.getInstance().compare(txt2, txt1);

-		} else {

-			res = Collator.getInstance().compare(txt1, txt2);

-		}

-		return res;

-	}

-}

+/*****************************************************************************
+ * 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.comparator;
+
+import java.text.Collator;
+
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+
+/**
+ * Axis Comparator used to sort the rows according to the selected column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowComparator extends AbstractAxisComparator {
+
+	private LabelProviderCellContextElementWrapper wrapper1;
+
+	private LabelProviderCellContextElementWrapper wrapper2;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selectedColumn
+	 *            the selected column
+	 * @param direction
+	 *            the direction to do the sort
+	 * @param tableManager
+	 *            the table manager
+	 */
+	public RowComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {
+		super(selectedColumn, direction, tableManager);
+		wrapper1 = new LabelProviderCellContextElementWrapper();
+		wrapper2 = new LabelProviderCellContextElementWrapper();
+		wrapper1.setConfigRegistry(configRegistry);
+		wrapper2.setConfigRegistry(configRegistry);
+	}
+
+	/**
+	 *
+	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+	 *
+	 * @param o1
+	 * @param o2
+	 * @return
+	 */
+	@Override
+	public int compare(final Object o1, final Object o2) {
+		int index_01 = tableManager.getRowElementsList().indexOf(o1);
+		int index_02 = tableManager.getRowElementsList().indexOf(o2);
+		int columnIndex = tableManager.getColumnElementsList().indexOf(selectedColumn);
+		if (columnIndex == -1) {
+			return 0;
+		}
+		final ILayerCell cell_O1 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_01);
+		final ILayerCell cell_O2 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_02);
+
+		wrapper1.setCell(cell_O1);
+		wrapper1.setObject(cell_O1.getDataValue());
+		wrapper2.setCell(cell_O2);
+		wrapper2.setObject(cell_O2.getDataValue());
+		final String txt1 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper1);
+		final String txt2 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper2);
+		final int res;
+		if (direction == SortDirectionEnum.DESC) {
+			res = Collator.getInstance().compare(txt2, txt1);
+		} else {
+			res = Collator.getInstance().compare(txt1, txt2);
+		}
+		return res;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
index 2479f404fd7..d847f292ddc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * 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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.ui.action.IMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.events.MouseEvent;

-

-/**

- *

- * This configuration allows to add action clicking on the top left corner of the table

- *

- */

-public class CornerConfiguration extends AbstractRegistryConfiguration {

-

-	/**

-	 * the manager of the table

-	 */

-	private INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the manager of the table

-	 */

-	public CornerConfiguration(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		super.configureUiBindings(uiBindingRegistry);

-		uiBindingRegistry.registerSingleClickBinding(new MouseEventMatcher(GridRegion.CORNER), new IMouseAction() {

-

-			@Override

-			public void run(final NatTable natTable, final MouseEvent event) {

-				manager.selectAll();

-			}

-		});

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(IConfigRegistry configRegistry) {

-		// nothing to do

-	}

-

-

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.ui.action.IMouseAction;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.events.MouseEvent;
+
+/**
+ *
+ * This configuration allows to add action clicking on the top left corner of the table
+ *
+ */
+public class CornerConfiguration extends AbstractRegistryConfiguration {
+
+	/**
+	 * the manager of the table
+	 */
+	private INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the manager of the table
+	 */
+	public CornerConfiguration(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		super.configureUiBindings(uiBindingRegistry);
+		uiBindingRegistry.registerSingleClickBinding(new MouseEventMatcher(GridRegion.CORNER), new IMouseAction() {
+
+			@Override
+			public void run(final NatTable natTable, final MouseEvent event) {
+				manager.selectAll();
+			}
+		});
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(IConfigRegistry configRegistry) {
+		// nothing to do
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
index 347d7a23901..cfd73f6b64a 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * 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

- *  Vincent Lorenzo (CEA-MIST) - 463058: [Table 2] Invert Axis + add/remove columns break the display of the table

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.EditableRule;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-

-

-/**

- *

- * The configuration for the edition of the table.

- * 

- * This configuration listen some elements to reset the cell editor declaration when required:

- * <li>the elements list to be able to reset the cell editor configuration after add/remove axis</li>

- * <li>the attribute invert axis of the table</li>

- * <li>the nattable widget to be able to remove added listener when the widget is disposed</li>

- *

- */

-public class EditConfiguration extends DefaultEditConfiguration {

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(IConfigRegistry configRegistry) {

-		// we call the super implementation

-		super.configureRegistry(configRegistry);

-

-		// we remove the default cell editor

-		configRegistry.unregisterConfigAttribute(EditConfigAttributes.CELL_EDITOR, DisplayMode.NORMAL, null);

-		

-		INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, new PapyrusEditableRule(manager));

-		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, null, DisplayMode.EDIT, ""); //$NON-NLS-1$

-	}

-	

-	/**

-	 * 

-	 * Rule for edition

-	 *

-	 */

-	private static final class PapyrusEditableRule extends EditableRule {

-

-		/**

-		 * the nattable manager

-		 */

-		private INattableModelManager manager;

-

-		/**

-		 * 

-		 * Constructor.

-		 *

-		 * @param tableManager

-		 *            the table manager

-		 */

-		private PapyrusEditableRule(INattableModelManager tableManager) {

-			this.manager = tableManager;

-		}

-

-		/**

-		 * 

-		 * @see org.eclipse.nebula.widgets.nattable.config.EditableRule#isEditable(int, int)

-		 *

-		 * @param columnIndex

-		 * @param rowIndex

-		 * @return

-		 */

-		@Override

-		public boolean isEditable(final int columnIndex, final int rowIndex) {

-			final Object rowElement = manager.getRowElement(rowIndex);

-			final Object columnElement = manager.getColumnElement(columnIndex);

-			return CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager);

-		}

-	}

-}

+/*****************************************************************************
+ * 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
+ *  Vincent Lorenzo (CEA-MIST) - 463058: [Table 2] Invert Axis + add/remove columns break the display of the table
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.EditableRule;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+
+/**
+ *
+ * The configuration for the edition of the table.
+ * 
+ * This configuration listen some elements to reset the cell editor declaration when required:
+ * <li>the elements list to be able to reset the cell editor configuration after add/remove axis</li>
+ * <li>the attribute invert axis of the table</li>
+ * <li>the nattable widget to be able to remove added listener when the widget is disposed</li>
+ *
+ */
+public class EditConfiguration extends DefaultEditConfiguration {
+
+	/**
+	 * 
+	 * @see org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(IConfigRegistry configRegistry) {
+		// we call the super implementation
+		super.configureRegistry(configRegistry);
+
+		// we remove the default cell editor
+		configRegistry.unregisterConfigAttribute(EditConfigAttributes.CELL_EDITOR, DisplayMode.NORMAL, null);
+		
+		INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, new PapyrusEditableRule(manager));
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, null, DisplayMode.EDIT, ""); //$NON-NLS-1$
+	}
+	
+	/**
+	 * 
+	 * Rule for edition
+	 *
+	 */
+	private static final class PapyrusEditableRule extends EditableRule {
+
+		/**
+		 * the nattable manager
+		 */
+		private INattableModelManager manager;
+
+		/**
+		 * 
+		 * Constructor.
+		 *
+		 * @param tableManager
+		 *            the table manager
+		 */
+		private PapyrusEditableRule(INattableModelManager tableManager) {
+			this.manager = tableManager;
+		}
+
+		/**
+		 * 
+		 * @see org.eclipse.nebula.widgets.nattable.config.EditableRule#isEditable(int, int)
+		 *
+		 * @param columnIndex
+		 * @param rowIndex
+		 * @return
+		 */
+		@Override
+		public boolean isEditable(final int columnIndex, final int rowIndex) {
+			final Object rowElement = manager.getRowElement(rowIndex);
+			final Object columnElement = manager.getColumnElement(columnIndex);
+			return CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
index cbfc1954e5b..1cbcf550f6c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;

-import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;

-import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;

-import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;

-

-/**

- *

- * The default style for the column. We provide a specific label provider and image painter

- *

- */

-public class PapyrusColumnHeaderStyleConfiguration extends DefaultColumnHeaderStyleConfiguration {

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(final IConfigRegistry configRegistry) {

-		this.cellPainter = new BeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));// new CustomizedCellPainter());

-		super.configureRegistry(configRegistry);

-	}

-

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;
+import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;
+import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;
+import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;
+
+/**
+ *
+ * The default style for the column. We provide a specific label provider and image painter
+ *
+ */
+public class PapyrusColumnHeaderStyleConfiguration extends DefaultColumnHeaderStyleConfiguration {
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(final IConfigRegistry configRegistry) {
+		this.cellPainter = new BeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));// new CustomizedCellPainter());
+		super.configureRegistry(configRegistry);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java
index 7bb1989beec..2f3051b0648 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * 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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.resize.action.ColumnResizeCursorAction;

-import org.eclipse.nebula.widgets.nattable.resize.event.ColumnResizeEventMatcher;

-import org.eclipse.nebula.widgets.nattable.resize.mode.ColumnResizeDragMode;

-import org.eclipse.nebula.widgets.nattable.ui.action.ClearCursorAction;

-import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- * Adapted code from DefaultRowResizeBindings. Allow to resize the columns on all regions of the table (corner, body, row header, column header)

- *

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusColumnResizeBindingsConfiguration extends AbstractUiBindingConfiguration {

-

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		// Mouse move - Show resize cursor

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 0), new ColumnResizeCursorAction());

-

-		uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(), new ClearCursorAction());

-

-		// Column resize

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 1), new ColumnResizeDragMode());

-

-		// uiBindingRegistry.registerDoubleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new AutoResizeColumnAction());

-		uiBindingRegistry.registerSingleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new NoOpMouseAction());

-	}

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.resize.action.ColumnResizeCursorAction;
+import org.eclipse.nebula.widgets.nattable.resize.event.ColumnResizeEventMatcher;
+import org.eclipse.nebula.widgets.nattable.resize.mode.ColumnResizeDragMode;
+import org.eclipse.nebula.widgets.nattable.ui.action.ClearCursorAction;
+import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.swt.SWT;
+
+/**
+ * Adapted code from DefaultRowResizeBindings. Allow to resize the columns on all regions of the table (corner, body, row header, column header)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusColumnResizeBindingsConfiguration extends AbstractUiBindingConfiguration {
+
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		// Mouse move - Show resize cursor
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 0), new ColumnResizeCursorAction());
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 0), new ColumnResizeCursorAction());
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 0), new ColumnResizeCursorAction());
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 0), new ColumnResizeCursorAction());
+
+		uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(), new ClearCursorAction());
+
+		// Column resize
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new ColumnResizeDragMode());
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new ColumnResizeDragMode());
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 1), new ColumnResizeDragMode());
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 1), new ColumnResizeDragMode());
+
+		// uiBindingRegistry.registerDoubleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new AutoResizeColumnAction());
+		uiBindingRegistry.registerSingleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new NoOpMouseAction());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
index 414360966d1..9ba39ba39f9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * 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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.edit.action.CellEditDragMode;

-import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;

-import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;

-import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditBindings;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.CellEditorMouseEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.LetterOrDigitKeyEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- *

- * @author Vincent Lorenzo

- *         Copy of {@link DefaultEditBindings} excepted for edition on double click replacing edition on single click

- */

-public class PapyrusDefaultEditBindings extends AbstractUiBindingConfiguration {

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		// configure the space key to activate a cell editor via keyboard

-		// this is especially useful for changing the value for a checkbox

-		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, 32), new KeyEditAction());

-		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());

-		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(), new KeyEditAction());

-		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(SWT.SHIFT), new KeyEditAction());

-

-		uiBindingRegistry.registerDoubleClickBinding(new CellEditorMouseEventMatcher(GridRegion.BODY), new MouseEditAction());

-

-		uiBindingRegistry.registerMouseDragMode(new CellEditorMouseEventMatcher(GridRegion.BODY), new CellEditDragMode());

-

-		uiBindingRegistry.registerFirstSingleClickBinding(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new MouseEditAction());

-

-		uiBindingRegistry.registerFirstMouseDragMode(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new CellEditDragMode());

-

-	}

-

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;
+import org.eclipse.nebula.widgets.nattable.edit.action.CellEditDragMode;
+import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;
+import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;
+import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditBindings;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellEditorMouseEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.LetterOrDigitKeyEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.swt.SWT;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         Copy of {@link DefaultEditBindings} excepted for edition on double click replacing edition on single click
+ */
+public class PapyrusDefaultEditBindings extends AbstractUiBindingConfiguration {
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		// configure the space key to activate a cell editor via keyboard
+		// this is especially useful for changing the value for a checkbox
+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, 32), new KeyEditAction());
+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());
+		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(), new KeyEditAction());
+		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(SWT.SHIFT), new KeyEditAction());
+
+		uiBindingRegistry.registerDoubleClickBinding(new CellEditorMouseEventMatcher(GridRegion.BODY), new MouseEditAction());
+
+		uiBindingRegistry.registerMouseDragMode(new CellEditorMouseEventMatcher(GridRegion.BODY), new CellEditDragMode());
+
+		uiBindingRegistry.registerFirstSingleClickBinding(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new MouseEditAction());
+
+		uiBindingRegistry.registerFirstMouseDragMode(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new CellEditDragMode());
+
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
index d5eab42972b..92cd6dfbf0b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
@@ -1,64 +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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- * The configuration for the popup to use in the header of the table

- *

- * Adapted code from AbstractHeaderMenuConfiguration

- *

- * @author Vincent Lorenzo

- * 

- * @deprecated since Papyrus 1.2 (Eclipse Neon), Use TablePopupMenuConfiguration instead or a subclass)

- */

-@Deprecated

-public class PapyrusHeaderMenuConfiguration extends AbstractUiBindingConfiguration {

-

-	/**

-	 * the category used for the column command

-	 * 

-	 * @deprecated with no replacement, because useless now

-	 * 

-	 */

-	@Deprecated

-	public static final String COLUMN_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.columns.command.category"; //$NON-NLS-1$

-

-	/**

-	 * the category used for the row command

-	 * 

-	 * @deprecated with no replacement, because useless now

-	 */

-	@Deprecated

-	public static final String ROW_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.rows.command.category"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(COLUMN_COMMANDS_CATEGORY_ID));

-		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(ROW_COMMANDS_CATEGORY_ID));

-

-	}

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.swt.SWT;
+
+/**
+ * The configuration for the popup to use in the header of the table
+ *
+ * Adapted code from AbstractHeaderMenuConfiguration
+ *
+ * @author Vincent Lorenzo
+ * 
+ * @deprecated since Papyrus 1.2 (Eclipse Neon), Use TablePopupMenuConfiguration instead or a subclass)
+ */
+@Deprecated
+public class PapyrusHeaderMenuConfiguration extends AbstractUiBindingConfiguration {
+
+	/**
+	 * the category used for the column command
+	 * 
+	 * @deprecated with no replacement, because useless now
+	 * 
+	 */
+	@Deprecated
+	public static final String COLUMN_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.columns.command.category"; //$NON-NLS-1$
+
+	/**
+	 * the category used for the row command
+	 * 
+	 * @deprecated with no replacement, because useless now
+	 */
+	@Deprecated
+	public static final String ROW_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.rows.command.category"; //$NON-NLS-1$
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(COLUMN_COMMANDS_CATEGORY_ID));
+		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(ROW_COMMANDS_CATEGORY_ID));
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
index 8662cf85412..3464316ea78 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
@@ -1,233 +1,233 @@
-/*****************************************************************************

- * 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.configuration;

-

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.Command;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.IHandler;

-import org.eclipse.core.commands.NotEnabledException;

-import org.eclipse.core.commands.NotHandledException;

-import org.eclipse.core.commands.common.NotDefinedException;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.handler.TreeRowHideShowCategoryHandler;

-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.Table;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-import org.eclipse.papyrus.infra.ui.util.EclipseCommandUtils;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.MenuItem;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.handlers.IHandlerService;

-

-/**

- * PopupAction for Papyrus -> The contents of the popup is builded for each right click and not builded only one time as in NatTable

- *

- * @author Vincent Lorenzo

- *

- * @deprecated since Papyrus 1.2 (Eclipse Neon)

- */

-@Deprecated

-public class PapyrusPopupMenuAction extends PopupMenuAction {

-

-	/** the category of the commands to add to this menu */

-	private final String category;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param categoryId

-	 *            the category of the commands to add to this menu

-	 */

-	public PapyrusPopupMenuAction(final String categoryId) {

-		super(null);// because we create the menu for each run

-		this.category = categoryId;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction#run(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void run(NatTable natTable, MouseEvent event) {

-		// we need to recreate the menu each time (we need to verify for each action if it is enabled or not

-		Menu menu = new Menu(natTable.getShell());

-		

-		buildMenu(menu, natTable);

-		//menu.setData(event.data); //commented to fix the bug 469376: [Table] Memory Leak : (Tree)NattableWidgetManager, EObjectTreeItemAxis and others objects are not disposed when the table is closed

-		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=469376

-		

-		

-		// PopupMenuBuilder builder = new PopupMenuBuilder(natTable, menu).withHideRowMenuItem();

-		// builder.withShowAllRowsMenuItem();

-		menu.setVisible(true);

-	}

-

-	/**

-	 *

-	 * @param popupMenu

-	 */

-	private void buildMenu(final Menu popupMenu, final NatTable natTable) {

-		final Collection<Command> commands = EclipseCommandUtils.getAllExistingCommandsInCategory(category);

-

-		for (final Command command : commands) {

-			final IHandler handler = command.getHandler();

-			if (handler == null || !(handler instanceof AbstractHandler)) {

-				continue;

-			}

-			// TODO : we should use the EclipseContext to transfert the eventData from here to the handler, but currently we can't have dependency on e4 plugins

-			// ((AbstractHandler)handler).setEnabled(eclipseContext);

-			((AbstractHandler) handler).setEnabled(null);

-			boolean isEnabled = handler.isEnabled();

-

-			if (isEnabled) {

-				if (this.category.equals(Constants.ROW_HEADER_COMMANDS_CATEGORY) && TreeRowHideShowCategoryHandler.COMMAND_ID.equals(command.getId())) {

-					addShowHideCategoryCommandToMenu(popupMenu, command, natTable);

-					continue;

-				}

-				MenuItem item = new MenuItem(popupMenu, SWT.PUSH);

-				item.setEnabled(true);

-				ImageDescriptor imageDescriptor = EclipseCommandUtils.getCommandIcon(command);

-				if (imageDescriptor != null) {

-					item.setImage(imageDescriptor.createImage());

-				}

-				try {

-					item.setText(command.getName());

-				} catch (NotDefinedException e) {

-					Activator.log.error(e);

-				}

-				item.addSelectionListener(new SelectionListener() {

-

-					@Override

-					public void widgetSelected(SelectionEvent e) {

-						executeCommand(command.getId());

-					}

-

-					@Override

-					public void widgetDefaultSelected(SelectionEvent e) {

-						// nothing do to

-					}

-				});

-			}

-		}

-	}

-

-	/**

-	 * execute the command

-	 */

-	private void executeCommand(String commandId) {

-		IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);

-		if (handlerService == null) {

-			Activator.log.warn("Handler service not found"); //$NON-NLS-1$

-			return;

-		}

-		try {

-			handlerService.executeCommand(commandId, new Event());

-		} catch (ExecutionException e) {

-			Activator.log.error(e);

-		} catch (NotDefinedException e) {

-			Activator.log.error(e);

-		} catch (NotEnabledException e) {

-			Activator.log.error(e);

-		} catch (NotHandledException e) {

-			Activator.log.error(e);

-		}

-	}

-

-

-	/**

-	 *

-	 * @param menu

-	 * @param command

-	 * @param natTable

-	 */

-	private void addShowHideCategoryCommandToMenu(final Menu menu, final Command command, final NatTable natTable) {

-		Table table = getTable(natTable);

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(table);

-		int min = 0;

-		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {

-			min++;

-		}

-		final IHandler handler = command.getHandler();

-		for (int depth = min; depth <= maxDepth; depth++) {

-			MenuItem item = new MenuItem(menu, SWT.CHECK);

-			final boolean isHidden = isHidden(table, depth);

-			item.setSelection(!isHidden);

-			String text = null;

-			text = NLS.bind(Messages.PapyrusPopupMenuAction_ShowCategoriesOnDepth, depth);

-			item.setText(text);

-			final Integer index = depth;

-			item.addSelectionListener(new SelectionListener() {

-

-				@Override

-				public void widgetSelected(SelectionEvent arg0) {

-					// TODO : we must be able to give the SelectionEvent to the handler using EclispeContext

-					Map<Object, Object> parameters = new HashMap<Object, Object>();

-					parameters.put(TreeRowHideShowCategoryHandler.DEPTH_PARAMETER_KEY, index);

-					parameters.put(TreeRowHideShowCategoryHandler.HIDE_CATEGORY_PARAMETER_KEY, Boolean.valueOf(!isHidden));

-					try {

-						handler.execute(new ExecutionEvent(command, parameters, null, null));

-					} catch (ExecutionException e) {

-						Activator.log.error(e);

-					}

-				}

-

-				@Override

-				public void widgetDefaultSelected(SelectionEvent arg0) {

-				}

-			});

-		}

-	}

-

-	private boolean isHidden(Table table, int depth) {

-		return StyleUtils.getHiddenDepths(table).contains(Integer.valueOf(depth));

-	}

-

-	/**

-	 *

-	 * @param natTable

-	 *            the natTable widget

-	 * @return

-	 *         the table

-	 */

-	private Table getTable(NatTable natTable) {

-		IConfigRegistry configRegistry = natTable.getConfigRegistry();

-		INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-		return modelManager.getTable();

-	}

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.handler.TreeRowHideShowCategoryHandler;
+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.Table;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+import org.eclipse.papyrus.infra.ui.util.EclipseCommandUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.IHandlerService;
+
+/**
+ * PopupAction for Papyrus -> The contents of the popup is builded for each right click and not builded only one time as in NatTable
+ *
+ * @author Vincent Lorenzo
+ *
+ * @deprecated since Papyrus 1.2 (Eclipse Neon)
+ */
+@Deprecated
+public class PapyrusPopupMenuAction extends PopupMenuAction {
+
+	/** the category of the commands to add to this menu */
+	private final String category;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param categoryId
+	 *            the category of the commands to add to this menu
+	 */
+	public PapyrusPopupMenuAction(final String categoryId) {
+		super(null);// because we create the menu for each run
+		this.category = categoryId;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction#run(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void run(NatTable natTable, MouseEvent event) {
+		// we need to recreate the menu each time (we need to verify for each action if it is enabled or not
+		Menu menu = new Menu(natTable.getShell());
+		
+		buildMenu(menu, natTable);
+		//menu.setData(event.data); //commented to fix the bug 469376: [Table] Memory Leak : (Tree)NattableWidgetManager, EObjectTreeItemAxis and others objects are not disposed when the table is closed
+		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=469376
+		
+		
+		// PopupMenuBuilder builder = new PopupMenuBuilder(natTable, menu).withHideRowMenuItem();
+		// builder.withShowAllRowsMenuItem();
+		menu.setVisible(true);
+	}
+
+	/**
+	 *
+	 * @param popupMenu
+	 */
+	private void buildMenu(final Menu popupMenu, final NatTable natTable) {
+		final Collection<Command> commands = EclipseCommandUtils.getAllExistingCommandsInCategory(category);
+
+		for (final Command command : commands) {
+			final IHandler handler = command.getHandler();
+			if (handler == null || !(handler instanceof AbstractHandler)) {
+				continue;
+			}
+			// TODO : we should use the EclipseContext to transfert the eventData from here to the handler, but currently we can't have dependency on e4 plugins
+			// ((AbstractHandler)handler).setEnabled(eclipseContext);
+			((AbstractHandler) handler).setEnabled(null);
+			boolean isEnabled = handler.isEnabled();
+
+			if (isEnabled) {
+				if (this.category.equals(Constants.ROW_HEADER_COMMANDS_CATEGORY) && TreeRowHideShowCategoryHandler.COMMAND_ID.equals(command.getId())) {
+					addShowHideCategoryCommandToMenu(popupMenu, command, natTable);
+					continue;
+				}
+				MenuItem item = new MenuItem(popupMenu, SWT.PUSH);
+				item.setEnabled(true);
+				ImageDescriptor imageDescriptor = EclipseCommandUtils.getCommandIcon(command);
+				if (imageDescriptor != null) {
+					item.setImage(imageDescriptor.createImage());
+				}
+				try {
+					item.setText(command.getName());
+				} catch (NotDefinedException e) {
+					Activator.log.error(e);
+				}
+				item.addSelectionListener(new SelectionListener() {
+
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						executeCommand(command.getId());
+					}
+
+					@Override
+					public void widgetDefaultSelected(SelectionEvent e) {
+						// nothing do to
+					}
+				});
+			}
+		}
+	}
+
+	/**
+	 * execute the command
+	 */
+	private void executeCommand(String commandId) {
+		IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
+		if (handlerService == null) {
+			Activator.log.warn("Handler service not found"); //$NON-NLS-1$
+			return;
+		}
+		try {
+			handlerService.executeCommand(commandId, new Event());
+		} catch (ExecutionException e) {
+			Activator.log.error(e);
+		} catch (NotDefinedException e) {
+			Activator.log.error(e);
+		} catch (NotEnabledException e) {
+			Activator.log.error(e);
+		} catch (NotHandledException e) {
+			Activator.log.error(e);
+		}
+	}
+
+
+	/**
+	 *
+	 * @param menu
+	 * @param command
+	 * @param natTable
+	 */
+	private void addShowHideCategoryCommandToMenu(final Menu menu, final Command command, final NatTable natTable) {
+		Table table = getTable(natTable);
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(table);
+		int min = 0;
+		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {
+			min++;
+		}
+		final IHandler handler = command.getHandler();
+		for (int depth = min; depth <= maxDepth; depth++) {
+			MenuItem item = new MenuItem(menu, SWT.CHECK);
+			final boolean isHidden = isHidden(table, depth);
+			item.setSelection(!isHidden);
+			String text = null;
+			text = NLS.bind(Messages.PapyrusPopupMenuAction_ShowCategoriesOnDepth, depth);
+			item.setText(text);
+			final Integer index = depth;
+			item.addSelectionListener(new SelectionListener() {
+
+				@Override
+				public void widgetSelected(SelectionEvent arg0) {
+					// TODO : we must be able to give the SelectionEvent to the handler using EclispeContext
+					Map<Object, Object> parameters = new HashMap<Object, Object>();
+					parameters.put(TreeRowHideShowCategoryHandler.DEPTH_PARAMETER_KEY, index);
+					parameters.put(TreeRowHideShowCategoryHandler.HIDE_CATEGORY_PARAMETER_KEY, Boolean.valueOf(!isHidden));
+					try {
+						handler.execute(new ExecutionEvent(command, parameters, null, null));
+					} catch (ExecutionException e) {
+						Activator.log.error(e);
+					}
+				}
+
+				@Override
+				public void widgetDefaultSelected(SelectionEvent arg0) {
+				}
+			});
+		}
+	}
+
+	private boolean isHidden(Table table, int depth) {
+		return StyleUtils.getHiddenDepths(table).contains(Integer.valueOf(depth));
+	}
+
+	/**
+	 *
+	 * @param natTable
+	 *            the natTable widget
+	 * @return
+	 *         the table
+	 */
+	private Table getTable(NatTable natTable) {
+		IConfigRegistry configRegistry = natTable.getConfigRegistry();
+		INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+		return modelManager.getTable();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
index e24f37c4147..49002bdb96c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * 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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;

-import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;

-import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;

-import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;

-import org.eclipse.papyrus.infra.nattable.painter.PapyrusBeveledBorderDecorator;

-

-/**

- *

- * The default style for the row header. We provide a specific label provider and image painter

- *

- */

-public class PapyrusRowHeaderStyleConfiguration extends DefaultRowHeaderStyleConfiguration {

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(final IConfigRegistry configRegistry) {

-		this.cellPainter = new PapyrusBeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));

-		// configureHeaderHasSelectionStyle(configRegistry);

-		super.configureRegistry(configRegistry);

-	}

-

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;
+import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;
+import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;
+import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;
+import org.eclipse.papyrus.infra.nattable.painter.PapyrusBeveledBorderDecorator;
+
+/**
+ *
+ * The default style for the row header. We provide a specific label provider and image painter
+ *
+ */
+public class PapyrusRowHeaderStyleConfiguration extends DefaultRowHeaderStyleConfiguration {
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(final IConfigRegistry configRegistry) {
+		this.cellPainter = new PapyrusBeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));
+		// configureHeaderHasSelectionStyle(configRegistry);
+		super.configureRegistry(configRegistry);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java
index 900c3c75781..8224d846810 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * 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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;

-import org.eclipse.nebula.widgets.nattable.tree.action.TreeExpandCollapseAction;

-import org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration;

-import org.eclipse.nebula.widgets.nattable.tree.painter.TreeImagePainter;

-import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusTreeLayerConfiguration extends DefaultTreeLayerConfiguration {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param treeLayer

-	 */

-	public PapyrusTreeLayerConfiguration(TreeLayer treeLayer) {

-		super(treeLayer);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		TreeExpandCollapseAction treeExpandCollapseAction = new TreeExpandCollapseAction();

-		// override GridRegion.BODY by GridRegion.ROW_HEADER

-		CellPainterMouseEventMatcher treeImagePainterMouseEventMatcher = new CellPainterMouseEventMatcher(GridRegion.ROW_HEADER, MouseEventMatcher.LEFT_BUTTON, TreeImagePainter.class);

-

-		uiBindingRegistry.registerFirstSingleClickBinding(treeImagePainterMouseEventMatcher, treeExpandCollapseAction);

-

-		// Obscure any mouse down bindings for this image painter

-		uiBindingRegistry.registerFirstMouseDownBinding(treeImagePainterMouseEventMatcher, new NoOpMouseAction());

-	}

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
+import org.eclipse.nebula.widgets.nattable.tree.action.TreeExpandCollapseAction;
+import org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration;
+import org.eclipse.nebula.widgets.nattable.tree.painter.TreeImagePainter;
+import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusTreeLayerConfiguration extends DefaultTreeLayerConfiguration {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param treeLayer
+	 */
+	public PapyrusTreeLayerConfiguration(TreeLayer treeLayer) {
+		super(treeLayer);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		TreeExpandCollapseAction treeExpandCollapseAction = new TreeExpandCollapseAction();
+		// override GridRegion.BODY by GridRegion.ROW_HEADER
+		CellPainterMouseEventMatcher treeImagePainterMouseEventMatcher = new CellPainterMouseEventMatcher(GridRegion.ROW_HEADER, MouseEventMatcher.LEFT_BUTTON, TreeImagePainter.class);
+
+		uiBindingRegistry.registerFirstSingleClickBinding(treeImagePainterMouseEventMatcher, treeExpandCollapseAction);
+
+		// Obscure any mouse down bindings for this image painter
+		uiBindingRegistry.registerFirstMouseDownBinding(treeImagePainterMouseEventMatcher, new NoOpMouseAction());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
index f193518f0b8..0744b2cf04b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.export.ExportConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;

-import org.eclipse.papyrus.infra.nattable.formatter.PapyrusExportFormatter;

-import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;

-

-/**

- * Register a specific Cellpainter

- *

- * @author Vincent Lorenzo

- *

- */

-public class StyleConfiguration extends DefaultNatTableStyleConfiguration {

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(final IConfigRegistry configRegistry) {

-		super.configureRegistry(configRegistry);

-		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter());

-		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter());

-		configRegistry.registerConfigAttribute(ExportConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());

-	}

-

-

-}

+/*****************************************************************************
+ * 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.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.export.ExportConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;
+import org.eclipse.papyrus.infra.nattable.formatter.PapyrusExportFormatter;
+import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;
+
+/**
+ * Register a specific Cellpainter
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class StyleConfiguration extends DefaultNatTableStyleConfiguration {
+
+	/**
+	 * 
+	 * @see org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(final IConfigRegistry configRegistry) {
+		super.configureRegistry(configRegistry);
+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter());
+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter());
+		configRegistry.registerConfigAttribute(ExportConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
index 469f2ca8d3c..74a408bed75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
@@ -1,106 +1,106 @@
-/*****************************************************************************

- * 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.converter;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * This converter uses the label provider service to display the correct text

- *

- * @author Vincent Lorenzo

- *

- */

-public class GenericDisplayConverter implements IDisplayConverter {

-

-	/**

-	 * wrapper used to get the label of the element to convert

-	 */

-	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();

-	

-	/**

-	 * throw new UnsupportedOperationException();

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(java.lang.Object)

-	 *

-	 * @param canonicalValue

-	 * @return

-	 */

-	@Override

-	public Object canonicalToDisplayValue(Object canonicalValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * throw new UnsupportedOperationException();

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(java.lang.Object)

-	 *

-	 * @param displayValue

-	 * @return

-	 */

-	@Override

-	public Object displayToCanonicalValue(Object displayValue) {

-		return displayValue.toString();

-	}

-	

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @param canonicalValue

-	 * @return

-	 */

-	@Override

-	public Object canonicalToDisplayValue(ILayerCell cell, final IConfigRegistry configRegistry, final Object canonicalValue) {

-		if (canonicalValue == null) {

-			return null;

-		}

-

-		final LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);

-		contextElement.setConfigRegistry(configRegistry);

-		contextElement.setCell(cell);

-		contextElement.setObject(canonicalValue);

-		Assert.isNotNull(labelProvider);

-		return labelProvider.getText(contextElement);

-	}

-

-	/**

-	 * throw new UnsupportedOperationException();

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @param displayValue

-	 * @return

-	 */

-	@Override

-	public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {

-		return displayValue;

-	}

-

-}

+/*****************************************************************************
+ * 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.converter;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+/**
+ * This converter uses the label provider service to display the correct text
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class GenericDisplayConverter implements IDisplayConverter {
+
+	/**
+	 * wrapper used to get the label of the element to convert
+	 */
+	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();
+	
+	/**
+	 * throw new UnsupportedOperationException();
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(java.lang.Object)
+	 *
+	 * @param canonicalValue
+	 * @return
+	 */
+	@Override
+	public Object canonicalToDisplayValue(Object canonicalValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * throw new UnsupportedOperationException();
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(java.lang.Object)
+	 *
+	 * @param displayValue
+	 * @return
+	 */
+	@Override
+	public Object displayToCanonicalValue(Object displayValue) {
+		return displayValue.toString();
+	}
+	
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @param canonicalValue
+	 * @return
+	 */
+	@Override
+	public Object canonicalToDisplayValue(ILayerCell cell, final IConfigRegistry configRegistry, final Object canonicalValue) {
+		if (canonicalValue == null) {
+			return null;
+		}
+
+		final LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		final ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);
+		contextElement.setConfigRegistry(configRegistry);
+		contextElement.setCell(cell);
+		contextElement.setObject(canonicalValue);
+		Assert.isNotNull(labelProvider);
+		return labelProvider.getText(contextElement);
+	}
+
+	/**
+	 * throw new UnsupportedOperationException();
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @param displayValue
+	 * @return
+	 */
+	@Override
+	public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {
+		return displayValue;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
index dd05c3f7cd3..9593fe27dbf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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.copy;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler;

-import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-

-/**

- * The handler for the copy selection to clipboard action

- *

- * @author Vincent Lorenzo

- *

- */

-public class CopySelectionToClipboardAction extends AbstractTableHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		INattableModelManager manager = getCurrentNattableModelManager();

-		((AbstractNattableWidgetManager) manager).copyToClipboard();

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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.copy;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler;
+import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+
+/**
+ * The handler for the copy selection to clipboard action
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CopySelectionToClipboardAction extends AbstractTableHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		INattableModelManager manager = getCurrentNattableModelManager();
+		((AbstractNattableWidgetManager) manager).copyToClipboard();
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
index 228d4581752..17f1c3cd24e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.ui.services.IDisposable;

-

-/**

- * The Class AbstractCompositeDataProvider.

- *

- * @author Vincent Lorenzo

- */

-public abstract class AbstractCompositeDataProvider implements IDataProvider, IDisposable {

-

-	/** the data providers. */

-	protected List<IDataProvider> providers;

-

-	/** the nattable model manager. */

-	protected INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the nattable model manager

-	 */

-	public AbstractCompositeDataProvider(final INattableModelManager manager) {

-		this.providers = new ArrayList<IDataProvider>();

-		this.manager = manager;

-	}

-

-	/**

-	 * Adds the data provider.

-	 *

-	 * @param provider

-	 *            a provider to had

-	 */

-	public void addDataProvider(final IDataProvider provider) {

-		providers.add(provider);

-	}

-

-	/**

-	 * Gets the data value.

-	 *

-	 * @param columnIndex

-	 *            the column index

-	 * @param rowIndex

-	 *            the row index

-	 * @return the data value

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$

-	}

-

-	/**

-	 * Sets the data value.

-	 *

-	 * @param columnIndex

-	 *            the column index

-	 * @param rowIndex

-	 *            the row index

-	 * @param newValue

-	 *            the new value

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 */

-	@Override

-	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {

-		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		for (final IDataProvider current : this.providers) {

-			if (current instanceof IDisposable) {

-				((IDisposable) current).dispose();

-			}

-		}

-		providers.clear();

-	}

-

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.ui.services.IDisposable;
+
+/**
+ * The Class AbstractCompositeDataProvider.
+ *
+ * @author Vincent Lorenzo
+ */
+public abstract class AbstractCompositeDataProvider implements IDataProvider, IDisposable {
+
+	/** the data providers. */
+	protected List<IDataProvider> providers;
+
+	/** the nattable model manager. */
+	protected INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the nattable model manager
+	 */
+	public AbstractCompositeDataProvider(final INattableModelManager manager) {
+		this.providers = new ArrayList<IDataProvider>();
+		this.manager = manager;
+	}
+
+	/**
+	 * Adds the data provider.
+	 *
+	 * @param provider
+	 *            a provider to had
+	 */
+	public void addDataProvider(final IDataProvider provider) {
+		providers.add(provider);
+	}
+
+	/**
+	 * Gets the data value.
+	 *
+	 * @param columnIndex
+	 *            the column index
+	 * @param rowIndex
+	 *            the row index
+	 * @return the data value
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Sets the data value.
+	 *
+	 * @param columnIndex
+	 *            the column index
+	 * @param rowIndex
+	 *            the row index
+	 * @param newValue
+	 *            the new value
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 */
+	@Override
+	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {
+		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * 
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		for (final IDataProvider current : this.providers) {
+			if (current instanceof IDisposable) {
+				((IDisposable) current).dispose();
+			}
+		}
+		providers.clear();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
index 157b4f8f787..a9bfb269ac1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.ui.services.IDisposable;

-

-

-public abstract class AbstractDataProvider implements IDataProvider, IDisposable {

-

-	/**

-	 * the manager used to manage the table

-	 */

-	protected INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 *            the manager of the table

-	 */

-	public AbstractDataProvider(final INattableModelManager tableModelManager) {

-		this.manager = tableModelManager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		return this.manager.getColumnCount();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		return this.manager.getRowCount();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		this.manager = 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.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.ui.services.IDisposable;
+
+
+public abstract class AbstractDataProvider implements IDataProvider, IDisposable {
+
+	/**
+	 * the manager used to manage the table
+	 */
+	protected INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 *            the manager of the table
+	 */
+	public AbstractDataProvider(final INattableModelManager tableModelManager) {
+		this.manager = tableModelManager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		return this.manager.getColumnCount();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		return this.manager.getRowCount();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		this.manager = null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
index cbc47c88036..8be649c3b23 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
@@ -1,205 +1,205 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-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.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.tools.util.IntegerAndSpreadsheetNumberConverter;

-

-/**

- * Abstract class for the header data provider

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractHeaderDataProvider extends AbstractDataProvider {

-

-	/** fields used to know what display in the headers */

-	protected boolean displayIndex;

-

-	protected boolean displayLabel;

-

-	protected boolean displayFilter;

-

-	protected AxisIndexStyle style;

-

-	/** listener on {@link Table#isInvertAxis()} feature */

-	private Adapter invertedListener;

-

-	/**

-	 * listener on the axis configuration

-	 */

-	private Adapter axisListener;

-

-	/**

-	 * listener on the table

-	 */

-	private Adapter localHeaderConfigListener;

-

-	/**

-	 * the listen axis configuration

-	 */

-	private AbstractHeaderAxisConfiguration listenAxisConfiguration;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public AbstractHeaderDataProvider(INattableModelManager tableModelManager) {// TODO : we don't manage the remove of the axis configuration (possible when we return to the initial configuration

-		super(tableModelManager);

-		this.listenAxisConfiguration = getAxisConfiguration();

-		initListeners();

-		this.manager.getTable().eAdapters().add(this.invertedListener);

-		this.manager.getTable().eAdapters().add(this.localHeaderConfigListener);

-		initFields();

-	}

-

-	/**

-	 * Create the listeners, but doesn't assign them to an object

-	 */

-	protected void initListeners() {

-		this.axisListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				final Object feature = msg.getFeature();

-				if (feature != null) {

-					if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter())) {

-						AbstractHeaderDataProvider.this.displayFilter = msg.getNewBooleanValue();

-						updateAxisCount();

-					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex())) {

-						AbstractHeaderDataProvider.this.displayIndex = msg.getNewBooleanValue();

-						updateAxisCount();

-					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel())) {

-						AbstractHeaderDataProvider.this.displayLabel = msg.getNewBooleanValue();

-						updateAxisCount();

-					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle())) {

-						AbstractHeaderDataProvider.this.style = AxisIndexStyle.get(msg.getNewStringValue());

-						updateAxisCount();

-					}

-				}

-			}

-		};

-		this.invertedListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {

-					final Object oldValue = msg.getOldValue();

-					final Object newValue = msg.getNewValue();

-					if (oldValue != null && newValue != null) {

-						initFields();

-					}

-				}

-			}

-		};

-

-		this.localHeaderConfigListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration()) {

-					initFields();

-				}

-			}

-		};

-	}

-

-	/**

-	 * init the field value, and update the listen axis if required

-	 */

-	private void initFields() {

-		if (this.listenAxisConfiguration != getAxisConfiguration() && this.listenAxisConfiguration != null) {

-			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);

-		}

-		this.listenAxisConfiguration = getAxisConfiguration();

-		if (this.listenAxisConfiguration != null) {

-			this.listenAxisConfiguration.eAdapters().add(this.axisListener);

-			if (this.listenAxisConfiguration instanceof AbstractHeaderAxisConfiguration) {

-				AbstractHeaderAxisConfiguration config = this.listenAxisConfiguration;

-				this.style = config.getIndexStyle();

-				this.displayFilter = config.isDisplayFilter();

-				this.displayLabel = config.isDisplayLabel();

-				this.displayIndex = config.isDisplayIndex();

-			}

-		}

-		updateAxisCount();

-	}

-

-	/**

-	 * this method is used to update the values in the inherited classes

-	 */

-	protected abstract void updateAxisCount();

-

-	/**

-	 *

-	 * @return

-	 *         the axis configuration to listen

-	 */

-	protected abstract AbstractHeaderAxisConfiguration getAxisConfiguration();

-

-	/**

-	 *

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		removeListeners();

-		this.listenAxisConfiguration = null;

-		super.dispose();

-	}

-

-	/**

-	 * remove the listener

-	 */

-	protected void removeListeners() {

-		if (this.listenAxisConfiguration != null) {

-			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);

-		}

-		this.manager.getTable().eAdapters().remove(this.invertedListener);

-		this.manager.getTable().eAdapters().remove(this.localHeaderConfigListener);

-	}

-

-	/**

-	 *

-	 * @param axisIndex

-	 *            the index of the axis

-	 * @return

-	 *         the index to display according to the index style

-	 */

-	protected Object getAxisIndex(int axisIndex) {

-		if (axisIndex > -1) {

-			switch (this.style) {

-			case ALPHABETIC:

-				return IntegerAndSpreadsheetNumberConverter.toString(axisIndex + 1);

-			case NUMERIC:

-				return axisIndex;

-			}

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+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.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.tools.util.IntegerAndSpreadsheetNumberConverter;
+
+/**
+ * Abstract class for the header data provider
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractHeaderDataProvider extends AbstractDataProvider {
+
+	/** fields used to know what display in the headers */
+	protected boolean displayIndex;
+
+	protected boolean displayLabel;
+
+	protected boolean displayFilter;
+
+	protected AxisIndexStyle style;
+
+	/** listener on {@link Table#isInvertAxis()} feature */
+	private Adapter invertedListener;
+
+	/**
+	 * listener on the axis configuration
+	 */
+	private Adapter axisListener;
+
+	/**
+	 * listener on the table
+	 */
+	private Adapter localHeaderConfigListener;
+
+	/**
+	 * the listen axis configuration
+	 */
+	private AbstractHeaderAxisConfiguration listenAxisConfiguration;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public AbstractHeaderDataProvider(INattableModelManager tableModelManager) {// TODO : we don't manage the remove of the axis configuration (possible when we return to the initial configuration
+		super(tableModelManager);
+		this.listenAxisConfiguration = getAxisConfiguration();
+		initListeners();
+		this.manager.getTable().eAdapters().add(this.invertedListener);
+		this.manager.getTable().eAdapters().add(this.localHeaderConfigListener);
+		initFields();
+	}
+
+	/**
+	 * Create the listeners, but doesn't assign them to an object
+	 */
+	protected void initListeners() {
+		this.axisListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification msg) {
+				final Object feature = msg.getFeature();
+				if (feature != null) {
+					if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter())) {
+						AbstractHeaderDataProvider.this.displayFilter = msg.getNewBooleanValue();
+						updateAxisCount();
+					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex())) {
+						AbstractHeaderDataProvider.this.displayIndex = msg.getNewBooleanValue();
+						updateAxisCount();
+					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel())) {
+						AbstractHeaderDataProvider.this.displayLabel = msg.getNewBooleanValue();
+						updateAxisCount();
+					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle())) {
+						AbstractHeaderDataProvider.this.style = AxisIndexStyle.get(msg.getNewStringValue());
+						updateAxisCount();
+					}
+				}
+			}
+		};
+		this.invertedListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification msg) {
+				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {
+					final Object oldValue = msg.getOldValue();
+					final Object newValue = msg.getNewValue();
+					if (oldValue != null && newValue != null) {
+						initFields();
+					}
+				}
+			}
+		};
+
+		this.localHeaderConfigListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification msg) {
+				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration()) {
+					initFields();
+				}
+			}
+		};
+	}
+
+	/**
+	 * init the field value, and update the listen axis if required
+	 */
+	private void initFields() {
+		if (this.listenAxisConfiguration != getAxisConfiguration() && this.listenAxisConfiguration != null) {
+			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);
+		}
+		this.listenAxisConfiguration = getAxisConfiguration();
+		if (this.listenAxisConfiguration != null) {
+			this.listenAxisConfiguration.eAdapters().add(this.axisListener);
+			if (this.listenAxisConfiguration instanceof AbstractHeaderAxisConfiguration) {
+				AbstractHeaderAxisConfiguration config = this.listenAxisConfiguration;
+				this.style = config.getIndexStyle();
+				this.displayFilter = config.isDisplayFilter();
+				this.displayLabel = config.isDisplayLabel();
+				this.displayIndex = config.isDisplayIndex();
+			}
+		}
+		updateAxisCount();
+	}
+
+	/**
+	 * this method is used to update the values in the inherited classes
+	 */
+	protected abstract void updateAxisCount();
+
+	/**
+	 *
+	 * @return
+	 *         the axis configuration to listen
+	 */
+	protected abstract AbstractHeaderAxisConfiguration getAxisConfiguration();
+
+	/**
+	 *
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		removeListeners();
+		this.listenAxisConfiguration = null;
+		super.dispose();
+	}
+
+	/**
+	 * remove the listener
+	 */
+	protected void removeListeners() {
+		if (this.listenAxisConfiguration != null) {
+			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);
+		}
+		this.manager.getTable().eAdapters().remove(this.invertedListener);
+		this.manager.getTable().eAdapters().remove(this.localHeaderConfigListener);
+	}
+
+	/**
+	 *
+	 * @param axisIndex
+	 *            the index of the axis
+	 * @return
+	 *         the index to display according to the index style
+	 */
+	protected Object getAxisIndex(int axisIndex) {
+		if (axisIndex > -1) {
+			switch (this.style) {
+			case ALPHABETIC:
+				return IntegerAndSpreadsheetNumberConverter.toString(axisIndex + 1);
+			case NUMERIC:
+				return axisIndex;
+			}
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
index 4ec409bb366..81b93302af7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class BodyDataProvider extends AbstractDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 *            the table manager

-	 */

-	public BodyDataProvider(final INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		IDataProvider provider = this.manager.getBodyDataProvider();

-		return provider.getDataValue(columnIndex, rowIndex);

-	}

-

-	@Override

-	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {

-		this.manager.setDataValue(columnIndex, rowIndex, newValue);

-	}

-

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class BodyDataProvider extends AbstractDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 *            the table manager
+	 */
+	public BodyDataProvider(final INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		IDataProvider provider = this.manager.getBodyDataProvider();
+		return provider.getDataValue(columnIndex, rowIndex);
+	}
+
+	@Override
+	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {
+		this.manager.setDataValue(columnIndex, rowIndex, newValue);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
index c0f2c30fe3d..7fc5f10a984 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * This manager is used to manage the column header.

- *

- *

- */

-@Deprecated

-public class ColumnHeaderDataProvider extends AbstractHeaderDataProvider {

-

-	private int rowCount;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the manager used to manage the table

-	 */

-	public ColumnHeaderDataProvider(final INattableModelManager manager) {

-		super(manager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		return this.rowCount;

-	}

-

-

-	/**

-	 * This class does not support multiple rows in the column header layer.

-	 */

-	@Override

-	public Object getDataValue(final int columnIndex, final int rowIndex) {

-		switch (this.rowCount) {

-		case 0:

-			return null;

-		case 1:

-			if (this.displayFilter) {

-				return null;// TODO not tested

-			} else if (this.displayIndex) {

-				return getAxisIndex(columnIndex);

-			} else if (this.displayLabel) {

-				return this.manager.getColumnElement(columnIndex);

-			}

-		case 2:

-			if (!this.displayFilter) {

-				if (rowIndex == 0) {

-					return getAxisIndex(columnIndex);

-				}

-				if (rowIndex == 1) {

-					return this.manager.getColumnElement(columnIndex);

-				}

-			} else {

-				// TODO not tested

-			}

-			break;

-		case 3:

-			if (!this.displayFilter) {

-				if (rowIndex == 0) {

-					return getAxisIndex(columnIndex);

-				}

-				if (rowIndex == 1) {

-					return this.manager.getColumnElement(columnIndex);

-				}

-				if (rowIndex == 2) {

-					// TODO not tested

-				}

-			}

-			break;

-		}

-		return null;

-	}

-

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		// TODO

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#updateAxisCount()

-	 *

-	 */

-	@Override

-	protected void updateAxisCount() {

-		int newAxisCOunt = 0;

-		if (this.displayFilter) {

-			newAxisCOunt++;

-		}

-		if (this.displayIndex) {

-			newAxisCOunt++;

-		}

-		if (this.displayLabel) {

-			newAxisCOunt++;

-		}

-		this.rowCount = newAxisCOunt;

-	}

-

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * This manager is used to manage the column header.
+ *
+ *
+ */
+@Deprecated
+public class ColumnHeaderDataProvider extends AbstractHeaderDataProvider {
+
+	private int rowCount;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the manager used to manage the table
+	 */
+	public ColumnHeaderDataProvider(final INattableModelManager manager) {
+		super(manager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		return this.rowCount;
+	}
+
+
+	/**
+	 * This class does not support multiple rows in the column header layer.
+	 */
+	@Override
+	public Object getDataValue(final int columnIndex, final int rowIndex) {
+		switch (this.rowCount) {
+		case 0:
+			return null;
+		case 1:
+			if (this.displayFilter) {
+				return null;// TODO not tested
+			} else if (this.displayIndex) {
+				return getAxisIndex(columnIndex);
+			} else if (this.displayLabel) {
+				return this.manager.getColumnElement(columnIndex);
+			}
+		case 2:
+			if (!this.displayFilter) {
+				if (rowIndex == 0) {
+					return getAxisIndex(columnIndex);
+				}
+				if (rowIndex == 1) {
+					return this.manager.getColumnElement(columnIndex);
+				}
+			} else {
+				// TODO not tested
+			}
+			break;
+		case 3:
+			if (!this.displayFilter) {
+				if (rowIndex == 0) {
+					return getAxisIndex(columnIndex);
+				}
+				if (rowIndex == 1) {
+					return this.manager.getColumnElement(columnIndex);
+				}
+				if (rowIndex == 2) {
+					// TODO not tested
+				}
+			}
+			break;
+		}
+		return null;
+	}
+
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		// TODO
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#updateAxisCount()
+	 *
+	 */
+	@Override
+	protected void updateAxisCount() {
+		int newAxisCOunt = 0;
+		if (this.displayFilter) {
+			newAxisCOunt++;
+		}
+		if (this.displayIndex) {
+			newAxisCOunt++;
+		}
+		if (this.displayLabel) {
+			newAxisCOunt++;
+		}
+		this.rowCount = newAxisCOunt;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java
index d78ec70857e..bbeb548c255 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class ColumnIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public ColumnIndexHeaderDataProvider(final INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 * @Override

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		if (this.displayIndex) {

-			return 1;

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		return getAxisIndex(columnIndex);

-	}

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class ColumnIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public ColumnIndexHeaderDataProvider(final INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 * @Override
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		if (this.displayIndex) {
+			return 1;
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		return getAxisIndex(columnIndex);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java
index d389dd806a4..cc4394dec38 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class ColumnLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public ColumnLabelHeaderDataProvider(INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		if (displayLabel) {

-			return 1;

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (columnIndex >= 0) {

-			return this.manager.getColumnElement(columnIndex);

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class ColumnLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public ColumnLabelHeaderDataProvider(INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		if (displayLabel) {
+			return 1;
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (columnIndex >= 0) {
+			return this.manager.getColumnElement(columnIndex);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java
index 4d21bce860f..e43ff5a3c04 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- * The Class CompositeColumnHeaderDataProvider.

- *

- * @author Vincent Lorenzo

- */

-public class CompositeColumnHeaderDataProvider extends AbstractCompositeDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the nattable model manager

-	 */

-	public CompositeColumnHeaderDataProvider(INattableModelManager manager) {

-		super(manager);

-	}

-

-

-	/**

-	 * Gets the row count.

-	 *

-	 * @return the row count

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()

-	 */

-	@Override

-	public int getRowCount() {

-		int i = 0;

-		for (IDataProvider current : providers) {

-			i += current.getRowCount();

-		}

-		return i;

-	}

-

-	/**

-	 * Gets the column count.

-	 *

-	 * @return the column count

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()

-	 */

-	@Override

-	public int getColumnCount() {

-		return this.manager.getColumnElementsList().size();

-	}

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * The Class CompositeColumnHeaderDataProvider.
+ *
+ * @author Vincent Lorenzo
+ */
+public class CompositeColumnHeaderDataProvider extends AbstractCompositeDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the nattable model manager
+	 */
+	public CompositeColumnHeaderDataProvider(INattableModelManager manager) {
+		super(manager);
+	}
+
+
+	/**
+	 * Gets the row count.
+	 *
+	 * @return the row count
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()
+	 */
+	@Override
+	public int getRowCount() {
+		int i = 0;
+		for (IDataProvider current : providers) {
+			i += current.getRowCount();
+		}
+		return i;
+	}
+
+	/**
+	 * Gets the column count.
+	 *
+	 * @return the column count
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()
+	 */
+	@Override
+	public int getColumnCount() {
+		return this.manager.getColumnElementsList().size();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java
index 056933d7af4..a71617507e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *         a composite header data provider

- *

- */

-public class CompositeRowHeaderDataProvider extends AbstractCompositeDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the nattable model manager

-	 */

-	public CompositeRowHeaderDataProvider(final INattableModelManager manager) {

-		super(manager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		int i = 0;

-		for (IDataProvider current : providers) {

-			i += current.getColumnCount();

-		}

-		return i;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		return this.manager.getRowElementsList().size();

-	}

-

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         a composite header data provider
+ *
+ */
+public class CompositeRowHeaderDataProvider extends AbstractCompositeDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the nattable model manager
+	 */
+	public CompositeRowHeaderDataProvider(final INattableModelManager manager) {
+		super(manager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		int i = 0;
+		for (IDataProvider current : providers) {
+			i += current.getColumnCount();
+		}
+		return i;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		return this.manager.getRowElementsList().size();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java
index 598e1a1d1b1..0c0e6d5e6fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-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.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class HierarchicalRowLabelHeaderDataProvider extends RowLabelHeaderDataProvider {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public HierarchicalRowLabelHeaderDataProvider(INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		if (displayLabel) {

-			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager);

-			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {

-				return 1;

-			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {

-				boolean hasConfForFirstLevel = FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.manager.getTable(), 0);

-				int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(this.manager.getTable());

-				int depth = maxDepth * 2;

-				if (!hasConfForFirstLevel) {

-					depth += 1;

-				} else {

-					depth += 2;

-				}

-				return depth;

-			}

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            a tree item axis

-	 * @return

-	 * 		the depth of the element

-	 */

-	protected final int getDepth(final ITreeItemAxis axis) {

-		if (this.manager instanceof ITreeNattableModelManager) {

-			return ((ITreeNattableModelManager) this.manager).getTreeItemDepth(axis);

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (rowIndex >= 0) {

-			Object rowElement = this.manager.getRowElement(rowIndex);

-			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager.getTable());

-			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {

-				return rowElement;

-			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {

-				if (rowElement instanceof ITreeItemAxis) {

-					int depth = getDepth((ITreeItemAxis) rowElement);

-					if (depth == columnIndex) {

-						return rowElement;

-					}

-				}

-			}

-		}

-		return ""; //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+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.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class HierarchicalRowLabelHeaderDataProvider extends RowLabelHeaderDataProvider {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public HierarchicalRowLabelHeaderDataProvider(INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		if (displayLabel) {
+			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager);
+			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {
+				return 1;
+			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {
+				boolean hasConfForFirstLevel = FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.manager.getTable(), 0);
+				int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(this.manager.getTable());
+				int depth = maxDepth * 2;
+				if (!hasConfForFirstLevel) {
+					depth += 1;
+				} else {
+					depth += 2;
+				}
+				return depth;
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            a tree item axis
+	 * @return
+	 * 		the depth of the element
+	 */
+	protected final int getDepth(final ITreeItemAxis axis) {
+		if (this.manager instanceof ITreeNattableModelManager) {
+			return ((ITreeNattableModelManager) this.manager).getTreeItemDepth(axis);
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (rowIndex >= 0) {
+			Object rowElement = this.manager.getRowElement(rowIndex);
+			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager.getTable());
+			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {
+				return rowElement;
+			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {
+				if (rowElement instanceof ITreeItemAxis) {
+					int depth = getDepth((ITreeItemAxis) rowElement);
+					if (depth == columnIndex) {
+						return rowElement;
+					}
+				}
+			}
+		}
+		return ""; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java
index 5880d3ae0d5..0a622a4778f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java
@@ -1,131 +1,131 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-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.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class RowIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public RowIndexHeaderDataProvider(final INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		if (this.displayIndex) {

-			return 1;

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (this.style == AxisIndexStyle.NUMERIC && displayIndexWithDepth() && TableHelper.isTreeTable(manager)) {

-			return getTreeRowIndex(rowIndex);

-		}

-		return getAxisIndex(rowIndex);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if the index must be displayed as depth

-	 */

-	protected boolean displayIndexWithDepth() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @param rowIndex

-	 *            a row index

-	 * @return

-	 *         a tree row index (1.0.0.1) ...

-	 */

-	private Object getTreeRowIndex(int rowIndex) {

-		// not finished just here for try

-		ITreeItemAxis axis = (ITreeItemAxis) manager.getRowElementsList().get(rowIndex);

-		StringBuilder builder = new StringBuilder();

-		ITreeItemAxis parent = axis;

-		while (parent != null) {

-			ITreeItemAxis p = parent.getParent();

-			if (p != null) {

-				int index = p.getChildren().indexOf(parent);

-				builder.append(index);

-				builder.append(".");//$NON-NLS-1$

-			} else {

-				builder.append("1");//$//$NON-NLS-1$

-			}

-

-			parent = p;

-

-		}

-		return builder.reverse().toString();

-	}

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+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.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class RowIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public RowIndexHeaderDataProvider(final INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		if (this.displayIndex) {
+			return 1;
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (this.style == AxisIndexStyle.NUMERIC && displayIndexWithDepth() && TableHelper.isTreeTable(manager)) {
+			return getTreeRowIndex(rowIndex);
+		}
+		return getAxisIndex(rowIndex);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if the index must be displayed as depth
+	 */
+	protected boolean displayIndexWithDepth() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @param rowIndex
+	 *            a row index
+	 * @return
+	 *         a tree row index (1.0.0.1) ...
+	 */
+	private Object getTreeRowIndex(int rowIndex) {
+		// not finished just here for try
+		ITreeItemAxis axis = (ITreeItemAxis) manager.getRowElementsList().get(rowIndex);
+		StringBuilder builder = new StringBuilder();
+		ITreeItemAxis parent = axis;
+		while (parent != null) {
+			ITreeItemAxis p = parent.getParent();
+			if (p != null) {
+				int index = p.getChildren().indexOf(parent);
+				builder.append(index);
+				builder.append(".");//$NON-NLS-1$
+			} else {
+				builder.append("1");//$//$NON-NLS-1$
+			}
+
+			parent = p;
+
+		}
+		return builder.reverse().toString();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java
index 3bbd9e4b357..4d591999b60 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java
@@ -1,92 +1,92 @@
-/*****************************************************************************

- * 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.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class RowLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public RowLabelHeaderDataProvider(INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		if (displayLabel) {

-			return 1;

-		}

-		return 0;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (rowIndex >= 0) {

-			return this.manager.getRowElement(rowIndex);

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * 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.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class RowLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public RowLabelHeaderDataProvider(INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		if (displayLabel) {
+			return 1;
+		}
+		return 0;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (rowIndex >= 0) {
+			return this.manager.getRowElement(rowIndex);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
index 770fe206308..575b9d30628 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
@@ -1,128 +1,128 @@
-/*****************************************************************************

- * 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.dialog;

-

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionWithCheckBoxDialog;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * This dialog adds a specific action on the okPressed() (opening a dialog)

- *

- * @author Vincent Lorenzo

- *

- */

-public class DisplayedAxisSelectorDialog extends MultipleValueSelectionWithCheckBoxDialog {

-

-	/**

-	 * the title of the information dialog

-	 */

-	private String informationDialogTitle;

-

-	/**

-	 * the message of the information dialog

-	 */

-	private String informationDialogMessage;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param unique

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, boolean unique) {

-		super(parentShell, selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {

-		super(parentShell, selector, title, unique, ordered, upperBound);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {

-		super(parentShell, selector, title, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title) {

-		super(parentShell, selector, title);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector) {

-		super(parentShell, selector);

-	}

-

-	/**

-	 *

-	 * @param title

-	 *            the title for the information dialog

-	 * @param message

-	 *            the message for the information dialog

-	 */

-	public void setInformationDialogValues(final String title, final String message) {

-		this.informationDialogTitle = title;

-		this.informationDialogMessage = message;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog#okPressed()

-	 *

-	 */

-	@Override

-	protected void okPressed() {

-		boolean mustContinue = true;

-

-		if (isDisplayingCheckBox() && !isChecked()) {

-			mustContinue = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), informationDialogTitle, informationDialogMessage);

-		}

-		if (mustContinue) {

-			super.okPressed();

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.dialog;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionWithCheckBoxDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This dialog adds a specific action on the okPressed() (opening a dialog)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class DisplayedAxisSelectorDialog extends MultipleValueSelectionWithCheckBoxDialog {
+
+	/**
+	 * the title of the information dialog
+	 */
+	private String informationDialogTitle;
+
+	/**
+	 * the message of the information dialog
+	 */
+	private String informationDialogMessage;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param unique
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, boolean unique) {
+		super(parentShell, selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {
+		super(parentShell, selector, title, unique, ordered, upperBound);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {
+		super(parentShell, selector, title, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title) {
+		super(parentShell, selector, title);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector) {
+		super(parentShell, selector);
+	}
+
+	/**
+	 *
+	 * @param title
+	 *            the title for the information dialog
+	 * @param message
+	 *            the message for the information dialog
+	 */
+	public void setInformationDialogValues(final String title, final String message) {
+		this.informationDialogTitle = title;
+		this.informationDialogMessage = message;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog#okPressed()
+	 *
+	 */
+	@Override
+	protected void okPressed() {
+		boolean mustContinue = true;
+
+		if (isDisplayingCheckBox() && !isChecked()) {
+			mustContinue = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), informationDialogTitle, informationDialogMessage);
+		}
+		if (mustContinue) {
+			super.okPressed();
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java
index 93e1ccee908..5f179b19848 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java
@@ -1,228 +1,228 @@
-/*****************************************************************************

- * 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dialog;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.viewers.ArrayContentProvider;

-import org.eclipse.jface.viewers.ColumnLabelProvider;

-import org.eclipse.jface.viewers.DoubleClickEvent;

-import org.eclipse.jface.viewers.IDoubleClickListener;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TableViewerColumn;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-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.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-

-/**

- * This dialog displays in a table the axis providers stored in a table's historic. It allows to choose one of them.

- *

- */

-public class LoadCurrentAxisProvidersDialog extends Dialog {

-

-	private TableViewer viewer;

-

-	private EList<AbstractAxisProvider> iAxisProvidersHistory;

-

-	private final AbstractAxisProvider currentColumnAxisProvider;

-

-	private AbstractAxisProvider selectedAxisProvider;

-

-	private ILabelProvider labelProvider;

-

-	private IConfigRegistry registry;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param iAxisProvidersHistory

-	 * @param currentColumnAxisProvider

-	 * @param registry

-	 */

-	public LoadCurrentAxisProvidersDialog(Shell parentShell, EList<AbstractAxisProvider> iAxisProvidersHistory, AbstractAxisProvider currentColumnAxisProvider, IConfigRegistry registry) {

-		super(parentShell);

-		this.iAxisProvidersHistory = iAxisProvidersHistory;

-		this.currentColumnAxisProvider = currentColumnAxisProvider;

-		this.registry = registry;

-	}

-

-	/**

-	 * Create the dialog.

-	 *

-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		final Composite composite = (Composite) super.createDialogArea(parent);

-		GridLayout layout = new GridLayout(1, false);

-		composite.setLayout(layout);

-		viewer = new TableViewer(composite, (SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER));

-		int[] bounds = { 300, 400, 400 };

-		String[] titles = { Messages.LoadCurrentAxisProvidersDialog_0, Messages.LoadCurrentAxisProvidersDialog_1, Messages.LoadCurrentAxisProvidersDialog_2 };

-

-		TableViewerColumn colName = createTableViewerColumn(titles[0], bounds[0], 0, viewer);

-		colName.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				AbstractAxisProvider provider = (AbstractAxisProvider) element;

-				String text = provider.getName();

-				if (currentColumnAxisProvider.equals(element)) {

-					text += Messages.LoadCurrentAxisProvidersDialog_3;

-				}

-				return text;

-			}

-

-			@Override

-			public Font getFont(Object element) {

-				Font font = super.getFont(element);

-

-				return font;

-			}

-

-		});

-		TableViewerColumn colDescription = createTableViewerColumn(titles[1], bounds[1], 1, viewer);

-		colDescription.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				AbstractAxisProvider provider = (AbstractAxisProvider) element;

-				return provider.getDescription();

-			}

-		});

-		TableViewerColumn colColumns = createTableViewerColumn(titles[2], bounds[2], 2, viewer);

-		colColumns.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				AbstractAxisProvider provider = (AbstractAxisProvider) element;

-				String text = ""; //$NON-NLS-1$

-				for (IAxis axis : provider.getAxis()) {

-					final Object representedElement = axis.getElement();

-					// ILabelProviderContextElement contextEl = new LabelProviderContextElement(axis, registry);

-					// LabelProviderService labelProvider = (ILabelProvider)registry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-					if (labelProvider != null) {

-						// text += labelProvider.getText(contextEl) + ", ";

-					} else {

-						if (representedElement instanceof ENamedElement) {

-							text += ((ENamedElement) representedElement).getName() + ", "; //$NON-NLS-1$

-						} else {

-							final String string = representedElement.toString();

-							text += string.substring(string.lastIndexOf("::") + 2) + ", "; //$NON-NLS-1$ //$NON-NLS-2$

-						}

-					}

-				}

-				// We cut the remaining comma and space

-				if (!text.isEmpty()) {

-					text = text.substring(0, text.length() - 2);

-				}

-				return text;

-			}

-		});

-		final Table table = viewer.getTable();

-		table.setHeaderVisible(true);

-		table.setLinesVisible(true);

-		viewer.setContentProvider(new ArrayContentProvider());

-		viewer.setInput(iAxisProvidersHistory);

-

-		// We add the listener for the selection

-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			@Override

-			public void selectionChanged(SelectionChangedEvent event) {

-				StructuredSelection selection = (StructuredSelection) event.getSelection();

-				setSelectedAxisProvider(selection.getFirstElement());

-			}

-

-		});

-		viewer.addDoubleClickListener(new IDoubleClickListener() {

-

-			@Override

-			public void doubleClick(DoubleClickEvent event) {

-				StructuredSelection selection = (StructuredSelection) event.getSelection();

-				setSelectedAxisProvider(selection.getFirstElement());

-				close();

-			}

-		});

-

-		viewer.refresh();

-		return composite;

-	}

-

-	/**

-	 * Set the axis provider selected by the user.

-	 *

-	 * @param firstElement

-	 */

-	private void setSelectedAxisProvider(Object firstElement) {

-		selectedAxisProvider = (AbstractAxisProvider) firstElement;

-	}

-

-

-	/**

-	 * Getter for the selected provider

-	 *

-	 * @return

-	 */

-	public AbstractAxisProvider getSelectedAxisProvider() {

-		return selectedAxisProvider;

-	}

-

-

-	/**

-	 * Create columns

-	 *

-	 * @param title

-	 * @param bound

-	 * @param colNumber

-	 * @param viewer

-	 * @return

-	 */

-	private TableViewerColumn createTableViewerColumn(String title, int bound, final int colNumber, TableViewer viewer) {

-		final TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);

-		final TableColumn column = viewerColumn.getColumn();

-		column.setText(title);

-		column.setWidth(bound);

-		column.setResizable(true);

-		column.setMoveable(true);

-		return viewerColumn;

-	}

-

-	/**

-	 * Set a label provider to show labels for each one of the axis of every axis provider

-	 *

-	 * @param labelProvider

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		this.labelProvider = labelProvider;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dialog;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+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.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+/**
+ * This dialog displays in a table the axis providers stored in a table's historic. It allows to choose one of them.
+ *
+ */
+public class LoadCurrentAxisProvidersDialog extends Dialog {
+
+	private TableViewer viewer;
+
+	private EList<AbstractAxisProvider> iAxisProvidersHistory;
+
+	private final AbstractAxisProvider currentColumnAxisProvider;
+
+	private AbstractAxisProvider selectedAxisProvider;
+
+	private ILabelProvider labelProvider;
+
+	private IConfigRegistry registry;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param iAxisProvidersHistory
+	 * @param currentColumnAxisProvider
+	 * @param registry
+	 */
+	public LoadCurrentAxisProvidersDialog(Shell parentShell, EList<AbstractAxisProvider> iAxisProvidersHistory, AbstractAxisProvider currentColumnAxisProvider, IConfigRegistry registry) {
+		super(parentShell);
+		this.iAxisProvidersHistory = iAxisProvidersHistory;
+		this.currentColumnAxisProvider = currentColumnAxisProvider;
+		this.registry = registry;
+	}
+
+	/**
+	 * Create the dialog.
+	 *
+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		final Composite composite = (Composite) super.createDialogArea(parent);
+		GridLayout layout = new GridLayout(1, false);
+		composite.setLayout(layout);
+		viewer = new TableViewer(composite, (SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER));
+		int[] bounds = { 300, 400, 400 };
+		String[] titles = { Messages.LoadCurrentAxisProvidersDialog_0, Messages.LoadCurrentAxisProvidersDialog_1, Messages.LoadCurrentAxisProvidersDialog_2 };
+
+		TableViewerColumn colName = createTableViewerColumn(titles[0], bounds[0], 0, viewer);
+		colName.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				AbstractAxisProvider provider = (AbstractAxisProvider) element;
+				String text = provider.getName();
+				if (currentColumnAxisProvider.equals(element)) {
+					text += Messages.LoadCurrentAxisProvidersDialog_3;
+				}
+				return text;
+			}
+
+			@Override
+			public Font getFont(Object element) {
+				Font font = super.getFont(element);
+
+				return font;
+			}
+
+		});
+		TableViewerColumn colDescription = createTableViewerColumn(titles[1], bounds[1], 1, viewer);
+		colDescription.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				AbstractAxisProvider provider = (AbstractAxisProvider) element;
+				return provider.getDescription();
+			}
+		});
+		TableViewerColumn colColumns = createTableViewerColumn(titles[2], bounds[2], 2, viewer);
+		colColumns.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				AbstractAxisProvider provider = (AbstractAxisProvider) element;
+				String text = ""; //$NON-NLS-1$
+				for (IAxis axis : provider.getAxis()) {
+					final Object representedElement = axis.getElement();
+					// ILabelProviderContextElement contextEl = new LabelProviderContextElement(axis, registry);
+					// LabelProviderService labelProvider = (ILabelProvider)registry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+					if (labelProvider != null) {
+						// text += labelProvider.getText(contextEl) + ", ";
+					} else {
+						if (representedElement instanceof ENamedElement) {
+							text += ((ENamedElement) representedElement).getName() + ", "; //$NON-NLS-1$
+						} else {
+							final String string = representedElement.toString();
+							text += string.substring(string.lastIndexOf("::") + 2) + ", "; //$NON-NLS-1$ //$NON-NLS-2$
+						}
+					}
+				}
+				// We cut the remaining comma and space
+				if (!text.isEmpty()) {
+					text = text.substring(0, text.length() - 2);
+				}
+				return text;
+			}
+		});
+		final Table table = viewer.getTable();
+		table.setHeaderVisible(true);
+		table.setLinesVisible(true);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setInput(iAxisProvidersHistory);
+
+		// We add the listener for the selection
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				StructuredSelection selection = (StructuredSelection) event.getSelection();
+				setSelectedAxisProvider(selection.getFirstElement());
+			}
+
+		});
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				StructuredSelection selection = (StructuredSelection) event.getSelection();
+				setSelectedAxisProvider(selection.getFirstElement());
+				close();
+			}
+		});
+
+		viewer.refresh();
+		return composite;
+	}
+
+	/**
+	 * Set the axis provider selected by the user.
+	 *
+	 * @param firstElement
+	 */
+	private void setSelectedAxisProvider(Object firstElement) {
+		selectedAxisProvider = (AbstractAxisProvider) firstElement;
+	}
+
+
+	/**
+	 * Getter for the selected provider
+	 *
+	 * @return
+	 */
+	public AbstractAxisProvider getSelectedAxisProvider() {
+		return selectedAxisProvider;
+	}
+
+
+	/**
+	 * Create columns
+	 *
+	 * @param title
+	 * @param bound
+	 * @param colNumber
+	 * @param viewer
+	 * @return
+	 */
+	private TableViewerColumn createTableViewerColumn(String title, int bound, final int colNumber, TableViewer viewer) {
+		final TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);
+		final TableColumn column = viewerColumn.getColumn();
+		column.setText(title);
+		column.setWidth(bound);
+		column.setResizable(true);
+		column.setMoveable(true);
+		return viewerColumn;
+	}
+
+	/**
+	 * Set a label provider to show labels for each one of the axis of every axis provider
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.labelProvider = labelProvider;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java
index ad5e22afc88..65bfe56c4c8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * 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.formatter;

-

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.export.excel.DefaultExportFormatter;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-

-/**

- * The export formatter to use to export the same text as the text displayed in the cells

- *

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusExportFormatter extends DefaultExportFormatter {

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.export.IExportFormatter#formatForExport(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public Object formatForExport(ILayerCell cell, IConfigRegistry configRegistry) {

-		Object dataValue = cell.getDataValue();

-		IDisplayConverter displayConverter = configRegistry.getConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, cell.getDisplayMode(), cell.getConfigLabels().getLabels());

-		return displayConverter.canonicalToDisplayValue(cell, configRegistry, dataValue);

-	}

-

-}

+/*****************************************************************************
+ * 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.formatter;
+
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.export.excel.DefaultExportFormatter;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+
+/**
+ * The export formatter to use to export the same text as the text displayed in the cells
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusExportFormatter extends DefaultExportFormatter {
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.export.IExportFormatter#formatForExport(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public Object formatForExport(ILayerCell cell, IConfigRegistry configRegistry) {
+		Object dataValue = cell.getDataValue();
+		IDisplayConverter displayConverter = configRegistry.getConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, cell.getDisplayMode(), cell.getConfigLabels().getLabels());
+		return displayConverter.canonicalToDisplayValue(cell, configRegistry, dataValue);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java
index b89ceda5751..dd6f59d5586 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java
@@ -1,68 +1,68 @@
-/* Glazed Lists                                                 (c) 2003-2006 */

-/* http://publicobject.com/glazedlists/                      publicobject.com,*/

-/*                                                     O'Dell Engineering Ltd.*/

-package org.eclipse.papyrus.infra.nattable.glazedlists.copy;

-

-import java.util.Iterator;

-import java.util.List;

-

-/**

- * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#SINGLE_COLUMN

- * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#MULTIPLE_COLUMN_MOUSE

- *

- * @author <a href="mailto:jesse@swank.ca">Jesse Wilson</a>

- */

-public final class MouseOnlySortingStrategy implements SortingStrategy {

-

-	/** if false, other sorting columns will be cleared before a click takes effect */

-	private final boolean multipleColumnSort;

-

-	/**

-	 * Create a new {@link8 ca.odell.glazedlists.impl.gui.MouseOnlySortingStrategy}, sorting multiple

-	 * columns or not as specified.

-	 */

-	public MouseOnlySortingStrategy(boolean multipleColumnSort) {

-		this.multipleColumnSort = multipleColumnSort;

-	}

-

-	/**

-	 * Adjust the sorting state based on receiving the specified clicks.

-	 */

-	public void columnClicked(SortingState sortingState, int column, int clicks, boolean shift, boolean control) {

-		SortingState.SortingColumn clickedColumn = sortingState.getColumns().get(column);

-		if (clickedColumn.getComparators().isEmpty())

-			return;

-

-		List<SortingState.SortingColumn> recentlyClickedColumns = sortingState.getRecentlyClickedColumns();

-

-		// on a double click, clear all click counts

-		if (clicks == 2) {

-			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {

-				SortingState.SortingColumn sortingColumn = i.next();

-				sortingColumn.clear();

-			}

-			recentlyClickedColumns.clear();

-

-			// if we're only sorting one column at a time, clear other columns

-		} else if (!multipleColumnSort) {

-			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {

-				SortingState.SortingColumn sortingColumn = i.next();

-				if (sortingColumn != clickedColumn) {

-					sortingColumn.clear();

-				}

-			}

-			recentlyClickedColumns.clear();

-		}

-

-		// add a click to the newly clicked column if it has any comparators

-		int netClicks = 1 + clickedColumn.getComparatorIndex() * 2 + (clickedColumn.isReverse() ? 1 : 0);

-		clickedColumn.setComparatorIndex((netClicks / 2) % clickedColumn.getComparators().size());

-		clickedColumn.setReverse(netClicks % 2 != 0);

-		if (!recentlyClickedColumns.contains(clickedColumn)) {

-			recentlyClickedColumns.add(clickedColumn);

-		}

-

-		// rebuild the sorting state

-		sortingState.fireSortingChanged();

-	}

+/* Glazed Lists                                                 (c) 2003-2006 */
+/* http://publicobject.com/glazedlists/                      publicobject.com,*/
+/*                                                     O'Dell Engineering Ltd.*/
+package org.eclipse.papyrus.infra.nattable.glazedlists.copy;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#SINGLE_COLUMN
+ * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#MULTIPLE_COLUMN_MOUSE
+ *
+ * @author <a href="mailto:jesse@swank.ca">Jesse Wilson</a>
+ */
+public final class MouseOnlySortingStrategy implements SortingStrategy {
+
+	/** if false, other sorting columns will be cleared before a click takes effect */
+	private final boolean multipleColumnSort;
+
+	/**
+	 * Create a new {@link8 ca.odell.glazedlists.impl.gui.MouseOnlySortingStrategy}, sorting multiple
+	 * columns or not as specified.
+	 */
+	public MouseOnlySortingStrategy(boolean multipleColumnSort) {
+		this.multipleColumnSort = multipleColumnSort;
+	}
+
+	/**
+	 * Adjust the sorting state based on receiving the specified clicks.
+	 */
+	public void columnClicked(SortingState sortingState, int column, int clicks, boolean shift, boolean control) {
+		SortingState.SortingColumn clickedColumn = sortingState.getColumns().get(column);
+		if (clickedColumn.getComparators().isEmpty())
+			return;
+
+		List<SortingState.SortingColumn> recentlyClickedColumns = sortingState.getRecentlyClickedColumns();
+
+		// on a double click, clear all click counts
+		if (clicks == 2) {
+			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {
+				SortingState.SortingColumn sortingColumn = i.next();
+				sortingColumn.clear();
+			}
+			recentlyClickedColumns.clear();
+
+			// if we're only sorting one column at a time, clear other columns
+		} else if (!multipleColumnSort) {
+			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {
+				SortingState.SortingColumn sortingColumn = i.next();
+				if (sortingColumn != clickedColumn) {
+					sortingColumn.clear();
+				}
+			}
+			recentlyClickedColumns.clear();
+		}
+
+		// add a click to the newly clicked column if it has any comparators
+		int netClicks = 1 + clickedColumn.getComparatorIndex() * 2 + (clickedColumn.isReverse() ? 1 : 0);
+		clickedColumn.setComparatorIndex((netClicks / 2) % clickedColumn.getComparators().size());
+		clickedColumn.setReverse(netClicks % 2 != 0);
+		if (!recentlyClickedColumns.contains(clickedColumn)) {
+			recentlyClickedColumns.add(clickedColumn);
+		}
+
+		// rebuild the sorting state
+		sortingState.fireSortingChanged();
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
index 8bdf6f943b6..7fdfe368b41 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- * Abstract class to edit the header cofniguration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractColumnChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration or <code>null</code> if it doesn't exists in the table

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		final Table table = getCurrentNattableModelManager().getTable();

-		if (!table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ * Abstract class to edit the header cofniguration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractColumnChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration or <code>null</code> if it doesn't exists in the table
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		final Table table = getCurrentNattableModelManager().getTable();
+		if (!table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
index db570156514..fb0dac3c0e7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The abstract handler used to change the column header label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractColumnChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ILabelProviderConfiguration getLabelProviderConfiguration() {

-		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(getCurrentNattableModelManager().getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		Table table = getCurrentNattableModelManager().getTable();

-		if (!table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration

-	 */

-	@Override

-	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {

-		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The abstract handler used to change the column header label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractColumnChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ILabelProviderConfiguration getLabelProviderConfiguration() {
+		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(getCurrentNattableModelManager().getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		Table table = getCurrentNattableModelManager().getTable();
+		if (!table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration
+	 */
+	@Override
+	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {
+		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
index ee019687b26..232b403e945 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.handler;

-

-import java.util.Hashtable;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExecutableExtension;

-

-/**

- * @author Vincent Lorenzo

- * 

- *

- */

-public abstract class AbstractParametricTreeTableHandler extends AbstractTreeTableHandler implements IExecutableExtension {

-

-	/**

-	 * the id of the parameter declared for the handler in the plugin.xml

-	 */

-	private String parameterId;

-

-	/**

-	 * the value of the par

-	 */

-	private String parameterValue;

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param expandedDepthArgName

-	 */

-	public AbstractParametricTreeTableHandler(String parameterId) {

-		this.parameterId = parameterId;

-	}

-

-	/**

-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)

-	 *

-	 * @param arg0

-	 * @param arg1

-	 * @param arg2

-	 * @throws CoreException

-	 */

-	@Override

-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

-		if (data instanceof Hashtable<?, ?> && this.parameterId != null) {

-			this.parameterValue = (String) ((Hashtable<?, ?>) data).get(this.parameterId);

-		}

-	}

-

-

-	/**

-	 * @return the parameterValue

-	 */

-	public String getParameterValue() {

-		return parameterValue;

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import java.util.Hashtable;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+
+/**
+ * @author Vincent Lorenzo
+ * 
+ *
+ */
+public abstract class AbstractParametricTreeTableHandler extends AbstractTreeTableHandler implements IExecutableExtension {
+
+	/**
+	 * the id of the parameter declared for the handler in the plugin.xml
+	 */
+	private String parameterId;
+
+	/**
+	 * the value of the par
+	 */
+	private String parameterValue;
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param expandedDepthArgName
+	 */
+	public AbstractParametricTreeTableHandler(String parameterId) {
+		this.parameterId = parameterId;
+	}
+
+	/**
+	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+	 *
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 * @throws CoreException
+	 */
+	@Override
+	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+		if (data instanceof Hashtable<?, ?> && this.parameterId != null) {
+			this.parameterValue = (String) ((Hashtable<?, ?>) data).get(this.parameterId);
+		}
+	}
+
+
+	/**
+	 * @return the parameterValue
+	 */
+	public String getParameterValue() {
+		return parameterValue;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
index d49489f6d6f..e565304292e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- * Abstract class to edit the header cofniguration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractRowChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @return

-	 *         the axis configuration used by the table, can't be <code>null</code>;

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {

-		AbstractHeaderAxisConfiguration conf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());

-		return conf;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		final Table table = getCurrentNattableModelManager().getTable();

-		if (table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ * Abstract class to edit the header cofniguration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractRowChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @return
+	 *         the axis configuration used by the table, can't be <code>null</code>;
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {
+		AbstractHeaderAxisConfiguration conf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());
+		return conf;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		final Table table = getCurrentNattableModelManager().getTable();
+		if (table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
index f5d2ee032e2..2e7b9e63c8f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-

-/**

- * The abstract handler used to change the row header label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractRowChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ILabelProviderConfiguration getLabelProviderConfiguration() {

-		return LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(getCurrentNattableModelManager().getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		Table table = getCurrentNattableModelManager().getTable();

-		if (table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getCurrentNattableModelManager().getTable());

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration

-	 */

-	@Override

-	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {

-		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+
+/**
+ * The abstract handler used to change the row header label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractRowChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ILabelProviderConfiguration getLabelProviderConfiguration() {
+		return LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(getCurrentNattableModelManager().getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		Table table = getCurrentNattableModelManager().getTable();
+		if (table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getCurrentNattableModelManager().getTable());
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration
+	 */
+	@Override
+	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {
+		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java
index f50718bbc37..79c5682c286 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractTreeRowHideShowCategoryHandler extends AbstractTreeTableHandler {

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if all categories are currently hidden

-	 */

-	protected boolean allCategoriesAreCurrentlyHidden() {

-		Table table = getTable();

-		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		if (values == null) {

-			return false;

-		}

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());

-		return values.getIntListValue().size() == (maxDepth + 1);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if all categories are currently visible

-	 */

-	protected boolean allCategoriesAreCurrentlyVisible() {

-		Table table = getTable();

-		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		return values == null || values.getIntListValue().isEmpty();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (FillingConfigurationUtils.getAllTreeFillingConfiguration(getTable()).size() == 0) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractTreeRowHideShowCategoryHandler extends AbstractTreeTableHandler {
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if all categories are currently hidden
+	 */
+	protected boolean allCategoriesAreCurrentlyHidden() {
+		Table table = getTable();
+		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		if (values == null) {
+			return false;
+		}
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());
+		return values.getIntListValue().size() == (maxDepth + 1);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if all categories are currently visible
+	 */
+	protected boolean allCategoriesAreCurrentlyVisible() {
+		Table table = getTable();
+		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		return values == null || values.getIntListValue().isEmpty();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (FillingConfigurationUtils.getAllTreeFillingConfiguration(getTable()).size() == 0) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
index f1500beab98..53c01174912 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractTreeTableHandler extends AbstractTableHandler {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if ((!TableHelper.isTreeTable(getCurrentNattableModelManager())) || getTreeNattableModelManager() == null) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current tree nattable model manager

-	 */

-	public ITreeNattableModelManager getTreeNattableModelManager() {

-		if (getCurrentNattableModelManager() instanceof ITreeNattableModelManager) {

-			return (ITreeNattableModelManager) getCurrentNattableModelManager();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractTreeTableHandler extends AbstractTableHandler {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if ((!TableHelper.isTreeTable(getCurrentNattableModelManager())) || getTreeNattableModelManager() == null) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the current tree nattable model manager
+	 */
+	public ITreeNattableModelManager getTreeNattableModelManager() {
+		if (getCurrentNattableModelManager() instanceof ITreeNattableModelManager) {
+			return (ITreeNattableModelManager) getCurrentNattableModelManager();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java
index b6c008cc291..9aa533537fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * 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.handler;

-

-import java.util.Collections;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.handlers.RadioState;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ChangeHierarchicalTableStyle extends AbstractTreeTableHandler {

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		if (HandlerUtil.matchesRadioState(event)) {

-			return null;// we are already in the updated state - do nothing

-		}

-

-		String currentState = event.getParameter(RadioState.PARAMETER_ID);

-		Table table = getTable();

-		TableDisplayStyle style = (TableDisplayStyle) table.getStyle(NattablestylePackage.eINSTANCE.getTableDisplayStyle());

-		Command cmd = null;

-		DisplayStyle value = DisplayStyle.get(currentState);

-		if (style == null) {

-			TableDisplayStyle displayStyle = NattablestyleFactory.eINSTANCE.createTableDisplayStyle();

-			displayStyle.setDisplayStyle(value);

-			cmd = new AddCommand(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(displayStyle));

-		} else {

-			cmd = new SetCommand(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle(), value);

-		}

-		if (cmd != null && cmd.canExecute()) {

-			getTableEditingDomain().getCommandStack().execute(cmd);

-			// and finally update the current state

-			HandlerUtil.updateRadioState(event.getCommand(), currentState);

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			final DisplayStyle style = TableHelper.getTableDisplayStyle(getCurrentNattableModelManager());

-			setBaseEnabled(DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style));

-		}

-

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import java.util.Collections;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.handlers.RadioState;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ChangeHierarchicalTableStyle extends AbstractTreeTableHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		if (HandlerUtil.matchesRadioState(event)) {
+			return null;// we are already in the updated state - do nothing
+		}
+
+		String currentState = event.getParameter(RadioState.PARAMETER_ID);
+		Table table = getTable();
+		TableDisplayStyle style = (TableDisplayStyle) table.getStyle(NattablestylePackage.eINSTANCE.getTableDisplayStyle());
+		Command cmd = null;
+		DisplayStyle value = DisplayStyle.get(currentState);
+		if (style == null) {
+			TableDisplayStyle displayStyle = NattablestyleFactory.eINSTANCE.createTableDisplayStyle();
+			displayStyle.setDisplayStyle(value);
+			cmd = new AddCommand(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(displayStyle));
+		} else {
+			cmd = new SetCommand(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle(), value);
+		}
+		if (cmd != null && cmd.canExecute()) {
+			getTableEditingDomain().getCommandStack().execute(cmd);
+			// and finally update the current state
+			HandlerUtil.updateRadioState(event.getCommand(), currentState);
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			final DisplayStyle style = TableHelper.getTableDisplayStyle(getCurrentNattableModelManager());
+			setBaseEnabled(DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style));
+		}
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
index bae4ddc16a1..7cf8359b114 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class CollapseAndExpandTreeHandler extends AbstractParametricTreeTableHandler {

-

-	/** the name of the parameter used by this handler */

-	public static final String COLLAPSED_DEPTH_ARG_NAME = "treeAction"; //$NON-NLS-1$

-

-	private CollapseAndExpandActionsEnum actionId;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parameterId

-	 */

-	public CollapseAndExpandTreeHandler() {

-		super(COLLAPSED_DEPTH_ARG_NAME);

-	}

-

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		getTreeNattableModelManager().doCollapseExpandAction(this.actionId, null);

-		return null;

-	}

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled() && this.actionId == null) {

-			setBaseEnabled(false);

-			return;

-		}

-		if (isEnabled()) {

-			switch (this.actionId) {

-			case COLLAPSE_ALL_FROM_SELECTION:

-			case COLLAPSE_ONE_LEVEL:

-			case EXPAND_ALL_FROM_SELECTION:

-			case EXPAND_ONE_LEVEL:

-				if (getFullSelectedRowsIndex(evaluationContext).isEmpty()) {

-					setBaseEnabled(false);

-				}

-				break;

-

-			default:

-				// nothing to do

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractParametricTreeTableHandler#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)

-	 *

-	 * @param config

-	 * @param propertyName

-	 * @param data

-	 * @throws CoreException

-	 */

-	@Override

-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

-		super.setInitializationData(config, propertyName, data);

-		this.actionId = CollapseAndExpandActionsEnum.valueOf(getParameterValue());

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class CollapseAndExpandTreeHandler extends AbstractParametricTreeTableHandler {
+
+	/** the name of the parameter used by this handler */
+	public static final String COLLAPSED_DEPTH_ARG_NAME = "treeAction"; //$NON-NLS-1$
+
+	private CollapseAndExpandActionsEnum actionId;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parameterId
+	 */
+	public CollapseAndExpandTreeHandler() {
+		super(COLLAPSED_DEPTH_ARG_NAME);
+	}
+
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		getTreeNattableModelManager().doCollapseExpandAction(this.actionId, null);
+		return null;
+	}
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled() && this.actionId == null) {
+			setBaseEnabled(false);
+			return;
+		}
+		if (isEnabled()) {
+			switch (this.actionId) {
+			case COLLAPSE_ALL_FROM_SELECTION:
+			case COLLAPSE_ONE_LEVEL:
+			case EXPAND_ALL_FROM_SELECTION:
+			case EXPAND_ONE_LEVEL:
+				if (getFullSelectedRowsIndex(evaluationContext).isEmpty()) {
+					setBaseEnabled(false);
+				}
+				break;
+
+			default:
+				// nothing to do
+				break;
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractParametricTreeTableHandler#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+	 *
+	 * @param config
+	 * @param propertyName
+	 * @param data
+	 * @throws CoreException
+	 */
+	@Override
+	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+		super.setInitializationData(config, propertyName, data);
+		this.actionId = CollapseAndExpandActionsEnum.valueOf(getParameterValue());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
index a640c56c825..aff25a456c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeColumnsCommand;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.nebula.widgets.nattable.util.GCFactory;

-

-/**

- * Handler to resize columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnAutoResizeHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			final NatTable natTable = eventData.getNatTable();

-			natTable.doCommand(new InitializeAutoResizeColumnsCommand(natTable, eventData.getColumnPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeColumnsCommand;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.nebula.widgets.nattable.util.GCFactory;
+
+/**
+ * Handler to resize columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnAutoResizeHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			final NatTable natTable = eventData.getNatTable();
+			natTable.doCommand(new InitializeAutoResizeColumnsCommand(natTable, eventData.getColumnPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
index 59428e1632e..bce1bad87ba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the elements represented by the selected columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDestroyAxisElementHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			final IAxisManager axisManager = getColumnAxisManager();

-			if (axisManager != null) {

-				axisManager.destroyAxisElement(getFullSelectedColumnsIndex(eventData));

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		NatEventData eventData = getNatEventData();

-		boolean enabled = false;

-		if (isEnabled() && eventData != null) {

-			final IAxisManager axisManager = getColumnAxisManager();

-			if (axisManager != null) {

-				final List<Integer> col = getFullSelectedColumnsIndex(eventData);

-				enabled = axisManager.canDestroyAxisElement(col);

-			}

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the elements represented by the selected columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDestroyAxisElementHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			final IAxisManager axisManager = getColumnAxisManager();
+			if (axisManager != null) {
+				axisManager.destroyAxisElement(getFullSelectedColumnsIndex(eventData));
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		NatEventData eventData = getNatEventData();
+		boolean enabled = false;
+		if (isEnabled() && eventData != null) {
+			final IAxisManager axisManager = getColumnAxisManager();
+			if (axisManager != null) {
+				final List<Integer> col = getFullSelectedColumnsIndex(eventData);
+				enabled = axisManager.canDestroyAxisElement(col);
+			}
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
index ff9dc6d9cfc..70b82db6033 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * 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.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the selected columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDestroyAxisHandler extends AbstractTableHandler {

-

-	/**

-	 * @Override

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final IAxisManager axisManager = getColumnAxisManager();

-		NatEventData eventData = getNatEventData();

-		if (axisManager != null && eventData!=null) {

-			axisManager.destroyAxis(getFullSelectedColumnsIndex(eventData));

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		NatEventData eventData = getNatEventData();

-		boolean enabled = false;

-		final IAxisManager axisManager = getColumnAxisManager();

-		if (isEnabled() && axisManager != null && eventData!=null) {

-			final List<Integer> col = getFullSelectedColumnsIndex(eventData);

-			enabled = axisManager.canDestroyAxis(col);

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the selected columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDestroyAxisHandler extends AbstractTableHandler {
+
+	/**
+	 * @Override
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final IAxisManager axisManager = getColumnAxisManager();
+		NatEventData eventData = getNatEventData();
+		if (axisManager != null && eventData!=null) {
+			axisManager.destroyAxis(getFullSelectedColumnsIndex(eventData));
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		NatEventData eventData = getNatEventData();
+		boolean enabled = false;
+		final IAxisManager axisManager = getColumnAxisManager();
+		if (isEnabled() && axisManager != null && eventData!=null) {
+			final List<Integer> col = getFullSelectedColumnsIndex(eventData);
+			enabled = axisManager.canDestroyAxis(col);
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
index 075f249c7d8..da01662272f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The handler to change the boolean value to display index header for column

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayIndexHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The handler to change the boolean value to display index header for column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayIndexHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
index 88aa18054cb..c96d07fe239 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the "/" for derived feature in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureIsDerivedHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the "/" for derived feature in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureIsDerivedHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
index c316051d464..065c753cb1a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the feature multiplicity in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureMultiplicityHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the feature multiplicity in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureMultiplicityHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
index 5aa1aa11c35..1d2e39ce328 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the name of the feature in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureNameHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the name of the feature in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureNameHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
index 23c9d5c09df..030e27360ec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the type of the feature in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureTypeHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the type of the feature in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureTypeHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
index abf8e54589e..8b0ba044f30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The handler to change the boolean value to display label header for column

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The handler to change the boolean value to display label header for column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
index ced182b0ff2..14c9c5cc9ba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the image in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelImageHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the image in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelImageHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
index f1fcaff50ce..4a2772c44bc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the text in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelTextHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the text in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelTextHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
index 4a596be0aa0..d5c98dd52f7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-

-//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2

-

-public class ColumnEditAliasHeaderHandler extends AbstractTableHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();

-			manager.openEditColumnAliasDialog(eventData);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event

-		super.setEnabled(evaluationContext);

-		final NatEventData eventData = getNatEventData();

-		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();

-		if (isEnabled() && eventData != null && manager != null) {

-			setBaseEnabled(manager.canEditColumnHeader(eventData));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+
+//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2
+
+public class ColumnEditAliasHeaderHandler extends AbstractTableHandler {
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();
+			manager.openEditColumnAliasDialog(eventData);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event
+		super.setEnabled(evaluationContext);
+		final NatEventData eventData = getNatEventData();
+		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();
+		if (isEnabled() && eventData != null && manager != null) {
+			setBaseEnabled(manager.canEditColumnHeader(eventData));
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
index 2d913f8f9ab..b161102b992 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013, 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.nattable.handler;

-

-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;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnMasterDisconnectRowSlaveHandler extends AbstractDisconnectSlaveHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractAxisProvider getAxisProviderToEdit() {

-		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		if (currentNattableModelManager == null ) {

-			return null;

-		}

-		return AxisUtils.getAxisProviderUsedForColumns(currentNattableModelManager);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 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.nattable.handler;
+
+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;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnMasterDisconnectRowSlaveHandler extends AbstractDisconnectSlaveHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractAxisProvider getAxisProviderToEdit() {
+		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		if (currentNattableModelManager == null ) {
+			return null;
+		}
+		return AxisUtils.getAxisProviderUsedForColumns(currentNattableModelManager);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
index 234d19d2563..05080a378d3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.papyrus.infra.nattable.wizard.ConfigureTableCategoriesWizard;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ConfigureCategoriesHandler extends AbstractTableHandler {

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		ConfigureTableCategoriesWizard wizard = new ConfigureTableCategoriesWizard(getCurrentNattableModelManager());

-		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);

-		dialog.open();

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.papyrus.infra.nattable.wizard.ConfigureTableCategoriesWizard;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ConfigureCategoriesHandler extends AbstractTableHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		ConfigureTableCategoriesWizard wizard = new ConfigureTableCategoriesWizard(getCurrentNattableModelManager());
+		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);
+		dialog.open();
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
index fb59f602256..e9ae4402157 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-

-public class ExportToXLSHandler extends AbstractTableHandler {

-

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if (manager != null) {

-			manager.exportToXLS();

-		}

-		return 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+
+public class ExportToXLSHandler extends AbstractTableHandler {
+
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		final INattableModelManager manager = getCurrentNattableModelManager();
+		if (manager != null) {
+			manager.exportToXLS();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
index a10b933114b..ad7a85a2ed2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-

-/**

- * The handler for the invert axis action

- *

- * @author Vincent Lorenzo

- *

- */

-public class InvertAxisHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		getCurrentNattableModelManager().invertAxis();

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+/**
+ * The handler for the invert axis action
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class InvertAxisHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		getCurrentNattableModelManager().invertAxis();
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java
index 4f43514caec..14d00dcb929 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to load column axis providers from the table's historic.

- *

- */

-public class LoadColumnAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {

-

-

-	/**

-	 * Get the EReference where the current column provider will be set.

-	 *

-	 */

-	@Override

-	public EReference getCurrentAxisProviderEFeature() {

-		return NattablePackage.eINSTANCE.getTable_CurrentColumnAxisProvider();

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for columns.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getCurrentAxisProvider() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();

-

-		}

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for columns.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()

-	 *

-	 * @return

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getAxisProvidersHistory() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();

-		}

-	}

-

-	/**

-	 * This handler is enabled only if the concerned axis manager allows to save a configuration.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getColumnAxisManager() != null) {

-			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getColumnAxisManager();

-			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to load column axis providers from the table's historic.
+ *
+ */
+public class LoadColumnAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {
+
+
+	/**
+	 * Get the EReference where the current column provider will be set.
+	 *
+	 */
+	@Override
+	public EReference getCurrentAxisProviderEFeature() {
+		return NattablePackage.eINSTANCE.getTable_CurrentColumnAxisProvider();
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for columns.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getCurrentAxisProvider() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();
+
+		}
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for columns.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()
+	 *
+	 * @return
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getAxisProvidersHistory() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();
+		}
+	}
+
+	/**
+	 * This handler is enabled only if the concerned axis manager allows to save a configuration.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getColumnAxisManager() != null) {
+			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getColumnAxisManager();
+			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java
index 7eba4a70043..6c3730dca90 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to load row axis providers from the table's historic.

- *

- */

-public class LoadRowAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {

-

-	/**

-	 * This handler is enabled only if the concerned axis manager allows to save a configuration.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getRowAxisManager() != null) {

-			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getRowAxisManager();

-			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for rows.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()

-	 *

-	 * @return

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getAxisProvidersHistory() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();

-		}

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for rows.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getCurrentAxisProvider() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();

-		}

-	}

-

-	/**

-	 * Get the EReference where the current column provider will be set.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProviderEFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	public EReference getCurrentAxisProviderEFeature() {

-		return NattablePackage.eINSTANCE.getTable_CurrentRowAxisProvider();

-	}

-

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to load row axis providers from the table's historic.
+ *
+ */
+public class LoadRowAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {
+
+	/**
+	 * This handler is enabled only if the concerned axis manager allows to save a configuration.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getRowAxisManager() != null) {
+			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getRowAxisManager();
+			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for rows.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()
+	 *
+	 * @return
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getAxisProvidersHistory() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();
+		}
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for rows.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getCurrentAxisProvider() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();
+		}
+	}
+
+	/**
+	 * Get the EReference where the current column provider will be set.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProviderEFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	public EReference getCurrentAxisProviderEFeature() {
+		return NattablePackage.eINSTANCE.getTable_CurrentRowAxisProvider();
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java
index e5dc31f1f52..3c3643d54ab 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * 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:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each column

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeColumnsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the columns"); //$NON-NLS-1$

-		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// the header currently used in the table

-		AbstractHeaderAxisConfiguration columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());

-		// the necessary merge boolean value

-		BooleanValueStyle mergeColumns = (BooleanValueStyle) columnHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);

-

-

-		// identify if the merge boolean was already created and updates it, if not creates it and set its value

-		if (mergeColumns != null) {

-			if (mergeColumns.isBooleanValue()) {

-				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-				mergeCommand.add(mergeColumnCommand);

-			} else {

-				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-				mergeCommand.add(mergeColumnCommand);

-			}

-		} else {

-			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it

-			if (columnHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {

-				// Creates the local column header if none already exists in the table

-				columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) columnHeaderUsedInTable);

-				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-

-				IEditCommandRequest initLocalColumnHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, columnHeaderUsedInTable);

-				IElementEditService localColumnHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());

-				mergeCommand.add(localColumnHeaderAxisProvider.getEditCommand(initLocalColumnHeaderAxis));

-			}

-

-			mergeColumns = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-			mergeColumns.setBooleanValue(true);

-			mergeColumns.setName(NamedStyleConstants.MERGE_COLUMNS);

-			SetRequest mergeColumnRequest = new SetRequest(tableDomain, columnHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeColumns);

-			SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-			mergeCommand.add(mergeColumnCommand);

-		}

-

-		// checks if the mergeRows option was already selected and, if so, switch its boolean to false as mergeColumns is activated to true

-		if (!isMerged) {

-			// resets the other merge booleans if any were to conflict with the current choice

-			updateTableSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each column
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeColumnsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the columns"); //$NON-NLS-1$
+		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// the header currently used in the table
+		AbstractHeaderAxisConfiguration columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());
+		// the necessary merge boolean value
+		BooleanValueStyle mergeColumns = (BooleanValueStyle) columnHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);
+
+
+		// identify if the merge boolean was already created and updates it, if not creates it and set its value
+		if (mergeColumns != null) {
+			if (mergeColumns.isBooleanValue()) {
+				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+				mergeCommand.add(mergeColumnCommand);
+			} else {
+				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+				mergeCommand.add(mergeColumnCommand);
+			}
+		} else {
+			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it
+			if (columnHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {
+				// Creates the local column header if none already exists in the table
+				columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) columnHeaderUsedInTable);
+				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+
+				IEditCommandRequest initLocalColumnHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, columnHeaderUsedInTable);
+				IElementEditService localColumnHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());
+				mergeCommand.add(localColumnHeaderAxisProvider.getEditCommand(initLocalColumnHeaderAxis));
+			}
+
+			mergeColumns = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+			mergeColumns.setBooleanValue(true);
+			mergeColumns.setName(NamedStyleConstants.MERGE_COLUMNS);
+			SetRequest mergeColumnRequest = new SetRequest(tableDomain, columnHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeColumns);
+			SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+			mergeCommand.add(mergeColumnCommand);
+		}
+
+		// checks if the mergeRows option was already selected and, if so, switch its boolean to false as mergeColumns is activated to true
+		if (!isMerged) {
+			// resets the other merge booleans if any were to conflict with the current choice
+			updateTableSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java
index 5f3a0c2231f..b44c597fa3d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * 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:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each row

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeRowsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the rows"); //$NON-NLS-1$

-		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// the header currently used in the table

-		AbstractHeaderAxisConfiguration rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getTable());

-		// the necessary merge boolean value

-		BooleanValueStyle mergeRows = (BooleanValueStyle) rowHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);

-

-

-		// identify if the merge boolean was already created and updates it, if not creates it and set its value

-		if (mergeRows != null) {

-			if (mergeRows.isBooleanValue()) {

-				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-				mergeCommand.add(mergeRowCommand);

-			} else {

-				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-				mergeCommand.add(mergeRowCommand);

-			}

-		} else {

-			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it

-			if (rowHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {

-				// Creates the local row header if none already exists in the table

-				rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) rowHeaderUsedInTable);

-				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-

-				IEditCommandRequest initLocalRowHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, rowHeaderUsedInTable);

-				IElementEditService localRowHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());

-				mergeCommand.add(localRowHeaderAxisProvider.getEditCommand(initLocalRowHeaderAxis));

-			}

-

-			mergeRows = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-			mergeRows.setBooleanValue(true);

-			mergeRows.setName(NamedStyleConstants.MERGE_ROWS);

-			SetRequest mergeRowRequest = new SetRequest(tableDomain, rowHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeRows);

-			SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-			mergeCommand.add(mergeRowCommand);

-		}

-

-		// checks if the mergeColumns option was already selected and, if so, switch its boolean to false as mergeRows is activated to true

-		if (!isMerged) {

-			// resets the table merge booleans if any were to conflict with the current choice

-			updateTableSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each row
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeRowsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the rows"); //$NON-NLS-1$
+		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// the header currently used in the table
+		AbstractHeaderAxisConfiguration rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getTable());
+		// the necessary merge boolean value
+		BooleanValueStyle mergeRows = (BooleanValueStyle) rowHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);
+
+
+		// identify if the merge boolean was already created and updates it, if not creates it and set its value
+		if (mergeRows != null) {
+			if (mergeRows.isBooleanValue()) {
+				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+				mergeCommand.add(mergeRowCommand);
+			} else {
+				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+				mergeCommand.add(mergeRowCommand);
+			}
+		} else {
+			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it
+			if (rowHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {
+				// Creates the local row header if none already exists in the table
+				rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) rowHeaderUsedInTable);
+				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+
+				IEditCommandRequest initLocalRowHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, rowHeaderUsedInTable);
+				IElementEditService localRowHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());
+				mergeCommand.add(localRowHeaderAxisProvider.getEditCommand(initLocalRowHeaderAxis));
+			}
+
+			mergeRows = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+			mergeRows.setBooleanValue(true);
+			mergeRows.setName(NamedStyleConstants.MERGE_ROWS);
+			SetRequest mergeRowRequest = new SetRequest(tableDomain, rowHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeRows);
+			SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+			mergeCommand.add(mergeRowCommand);
+		}
+
+		// checks if the mergeColumns option was already selected and, if so, switch its boolean to false as mergeRows is activated to true
+		if (!isMerged) {
+			// resets the table merge booleans if any were to conflict with the current choice
+			updateTableSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java
index 80b94690760..d2689ca0833 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java
@@ -1,143 +1,143 @@
-/*****************************************************************************

- * 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:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each selected columns

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeSelectedColumnsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected columns"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// the layer of the table used to identify the selected rows

-		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// get the table's manager in order to browse through the axis

-		INattableModelManager manager = getCurrentNattableModelManager();

-		// the array of selected columns

-		int[] selectedColumns = bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions();

-		// the list of selected columns' indexes

-		List<Integer> selectedCs = ArrayUtil.asIntegerList(bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions());

-		// the list of previously merged columns' indexes

-		int idex = 0;

-		List<Integer> mergedColumns = new ArrayList<Integer>();

-		// for(IAxis currentAxis : manager.getTable().getCurrentColumnAxisProvider().getAxis()) {

-		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,

-		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis

-		for (Object currentObject : manager.getColumnElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					mergedColumns.add(idex);

-				}

-				idex++;

-			}

-		}

-		// if (mergedColumns.size() > 0)

-		// isMerged = true;

-

-

-		// looks inside the axis and updates or creates the merge boolean of the selected axis

-		if (!isMerged || (isMerged && !selectedCs.equals(mergedColumns))) {

-			List<IAxis> selectedColumnAxis = new ArrayList<IAxis>();

-			for (int index : selectedColumns) {

-				Object currentColumnObject = getCurrentNattableModelManager().getColumnElement(index);

-				if (currentColumnObject instanceof IAxis) {

-					IAxis currentColumnIAxis = (IAxis) currentColumnObject;

-					if (currentColumnIAxis.eContainer() != null) {

-						selectedColumnAxis.add(currentColumnIAxis);

-						BooleanValueStyle isSelected = (BooleanValueStyle) currentColumnIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-						if (isSelected != null) {

-							SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-							SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-							mergeCommand.add(mergeColumnCommand);

-

-						} else {

-							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-							isSelected.setBooleanValue(true);

-							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-							SetRequest initColumnMergeRequest = new SetRequest(tableDomain, currentColumnIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);

-							SetValueCommand mergeColumnCommand = new SetValueCommand(initColumnMergeRequest);

-							mergeCommand.add(mergeColumnCommand);

-						}

-					}

-				}

-			}

-

-			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated

-			if (!selectedCs.equals(mergedColumns)) {

-				for (int sel : mergedColumns) {

-					// if an axis were previously selected but not anymore

-					if (!selectedCs.contains(sel)) {

-						if (manager.getColumnElement(sel) instanceof IAxis) {

-							IAxis toUnMerge = (IAxis) manager.getColumnElement(sel);

-							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-							// test to be sure but this element should already have the style and have its value to true

-							if (isSelected != null) {

-								SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-								SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-								mergeCommand.add(mergeColumnCommand);

-							}

-						}

-					}

-				}

-				// resets the merge booleans if the user has not selected at least one full column

-				if (selectedCs.size() == 0) {

-					updateAxisSpanBooleans(commandId, mergeCommand);

-				}

-			}

-

-		} else {

-			// resets the axis merge booleans

-			updateAxisSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each selected columns
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeSelectedColumnsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected columns"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// the layer of the table used to identify the selected rows
+		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// get the table's manager in order to browse through the axis
+		INattableModelManager manager = getCurrentNattableModelManager();
+		// the array of selected columns
+		int[] selectedColumns = bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions();
+		// the list of selected columns' indexes
+		List<Integer> selectedCs = ArrayUtil.asIntegerList(bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions());
+		// the list of previously merged columns' indexes
+		int idex = 0;
+		List<Integer> mergedColumns = new ArrayList<Integer>();
+		// for(IAxis currentAxis : manager.getTable().getCurrentColumnAxisProvider().getAxis()) {
+		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,
+		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis
+		for (Object currentObject : manager.getColumnElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					mergedColumns.add(idex);
+				}
+				idex++;
+			}
+		}
+		// if (mergedColumns.size() > 0)
+		// isMerged = true;
+
+
+		// looks inside the axis and updates or creates the merge boolean of the selected axis
+		if (!isMerged || (isMerged && !selectedCs.equals(mergedColumns))) {
+			List<IAxis> selectedColumnAxis = new ArrayList<IAxis>();
+			for (int index : selectedColumns) {
+				Object currentColumnObject = getCurrentNattableModelManager().getColumnElement(index);
+				if (currentColumnObject instanceof IAxis) {
+					IAxis currentColumnIAxis = (IAxis) currentColumnObject;
+					if (currentColumnIAxis.eContainer() != null) {
+						selectedColumnAxis.add(currentColumnIAxis);
+						BooleanValueStyle isSelected = (BooleanValueStyle) currentColumnIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+						if (isSelected != null) {
+							SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+							SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+							mergeCommand.add(mergeColumnCommand);
+
+						} else {
+							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+							isSelected.setBooleanValue(true);
+							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+							SetRequest initColumnMergeRequest = new SetRequest(tableDomain, currentColumnIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);
+							SetValueCommand mergeColumnCommand = new SetValueCommand(initColumnMergeRequest);
+							mergeCommand.add(mergeColumnCommand);
+						}
+					}
+				}
+			}
+
+			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated
+			if (!selectedCs.equals(mergedColumns)) {
+				for (int sel : mergedColumns) {
+					// if an axis were previously selected but not anymore
+					if (!selectedCs.contains(sel)) {
+						if (manager.getColumnElement(sel) instanceof IAxis) {
+							IAxis toUnMerge = (IAxis) manager.getColumnElement(sel);
+							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+							// test to be sure but this element should already have the style and have its value to true
+							if (isSelected != null) {
+								SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+								SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+								mergeCommand.add(mergeColumnCommand);
+							}
+						}
+					}
+				}
+				// resets the merge booleans if the user has not selected at least one full column
+				if (selectedCs.size() == 0) {
+					updateAxisSpanBooleans(commandId, mergeCommand);
+				}
+			}
+
+		} else {
+			// resets the axis merge booleans
+			updateAxisSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java
index 9b8fa268050..4996e6bea07 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java
@@ -1,143 +1,143 @@
-/*****************************************************************************

- * 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:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each selected rows

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeSelectedRowsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected rows"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// the layer of the table used to identify the selected rows

-		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// get the table's manager in order to browse through the axis

-		INattableModelManager manager = getCurrentNattableModelManager();

-		// the array of selected rows

-		int[] selectedRows = bodyLayerStack.getSelectionLayer().getFullySelectedRowPositions();

-		// the list of selected rows' indexes

-		List<Integer> selectedRs = ArrayUtil.asIntegerList(selectedRows);

-		// the list of previously merged rows' indexes

-		int idex = 0;

-		List<Integer> mergedRows = new ArrayList<Integer>();

-		// for(IAxis currentAxis : manager.getTable().getCurrentRowAxisProvider().getAxis()) {

-		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,

-		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis

-		for (Object currentObject : manager.getRowElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					mergedRows.add(idex);

-				}

-				idex++;

-			}

-		}

-		// if (mergedRows.size() > 0)

-		// isMerged = true;

-

-

-		// looks inside the axis and updates or creates the merge boolean of the selected axis

-		if (!isMerged || (isMerged && !selectedRs.equals(mergedRows))) {

-			List<IAxis> selectedRowAxis = new ArrayList<IAxis>();

-			for (int index : selectedRows) {

-				Object currentRowObject = getCurrentNattableModelManager().getRowElement(index);

-				if (currentRowObject instanceof IAxis) {

-					IAxis currentRowIAxis = (IAxis) currentRowObject;

-					if (currentRowIAxis.eContainer() != null) {

-						selectedRowAxis.add(currentRowIAxis);

-						BooleanValueStyle isSelected = (BooleanValueStyle) currentRowIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-						if (isSelected != null) {

-							SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-							SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-							mergeCommand.add(mergeRowCommand);

-

-						} else {

-							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-							isSelected.setBooleanValue(true);

-							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-							SetRequest initRowMergeRequest = new SetRequest(tableDomain, currentRowIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);

-							SetValueCommand mergeRowCommand = new SetValueCommand(initRowMergeRequest);

-							mergeCommand.add(mergeRowCommand);

-						}

-					}

-				}

-			}

-

-			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated

-			if (!selectedRs.equals(mergedRows)) {

-				for (int sel : mergedRows) {

-					// if an axis were previously selected but not anymore

-					if (!selectedRs.contains(sel)) {

-						if (manager.getRowElement(sel) instanceof IAxis) {

-							IAxis toUnMerge = (IAxis) manager.getRowElement(sel);

-							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-							// test to be sure but this element should already have the style and have its value to true

-							if (isSelected != null) {

-								SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-								SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-								mergeCommand.add(mergeRowCommand);

-							}

-						}

-					}

-				}

-				// resets the merge booleans if the user has not selected at least one full row

-				if (selectedRs.size() == 0) {

-					updateAxisSpanBooleans(commandId, mergeCommand);

-				}

-			}

-

-		} else {

-			// resets the axis merge booleans

-			updateAxisSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each selected rows
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeSelectedRowsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected rows"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// the layer of the table used to identify the selected rows
+		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// get the table's manager in order to browse through the axis
+		INattableModelManager manager = getCurrentNattableModelManager();
+		// the array of selected rows
+		int[] selectedRows = bodyLayerStack.getSelectionLayer().getFullySelectedRowPositions();
+		// the list of selected rows' indexes
+		List<Integer> selectedRs = ArrayUtil.asIntegerList(selectedRows);
+		// the list of previously merged rows' indexes
+		int idex = 0;
+		List<Integer> mergedRows = new ArrayList<Integer>();
+		// for(IAxis currentAxis : manager.getTable().getCurrentRowAxisProvider().getAxis()) {
+		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,
+		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis
+		for (Object currentObject : manager.getRowElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					mergedRows.add(idex);
+				}
+				idex++;
+			}
+		}
+		// if (mergedRows.size() > 0)
+		// isMerged = true;
+
+
+		// looks inside the axis and updates or creates the merge boolean of the selected axis
+		if (!isMerged || (isMerged && !selectedRs.equals(mergedRows))) {
+			List<IAxis> selectedRowAxis = new ArrayList<IAxis>();
+			for (int index : selectedRows) {
+				Object currentRowObject = getCurrentNattableModelManager().getRowElement(index);
+				if (currentRowObject instanceof IAxis) {
+					IAxis currentRowIAxis = (IAxis) currentRowObject;
+					if (currentRowIAxis.eContainer() != null) {
+						selectedRowAxis.add(currentRowIAxis);
+						BooleanValueStyle isSelected = (BooleanValueStyle) currentRowIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+						if (isSelected != null) {
+							SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+							SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+							mergeCommand.add(mergeRowCommand);
+
+						} else {
+							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+							isSelected.setBooleanValue(true);
+							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+							SetRequest initRowMergeRequest = new SetRequest(tableDomain, currentRowIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);
+							SetValueCommand mergeRowCommand = new SetValueCommand(initRowMergeRequest);
+							mergeCommand.add(mergeRowCommand);
+						}
+					}
+				}
+			}
+
+			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated
+			if (!selectedRs.equals(mergedRows)) {
+				for (int sel : mergedRows) {
+					// if an axis were previously selected but not anymore
+					if (!selectedRs.contains(sel)) {
+						if (manager.getRowElement(sel) instanceof IAxis) {
+							IAxis toUnMerge = (IAxis) manager.getRowElement(sel);
+							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+							// test to be sure but this element should already have the style and have its value to true
+							if (isSelected != null) {
+								SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+								SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+								mergeCommand.add(mergeRowCommand);
+							}
+						}
+					}
+				}
+				// resets the merge booleans if the user has not selected at least one full row
+				if (selectedRs.size() == 0) {
+					updateAxisSpanBooleans(commandId, mergeCommand);
+				}
+			}
+
+		} else {
+			// resets the axis merge booleans
+			updateAxisSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java
index a5d1df1097f..8ef42e11445 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-

-

-public class MergeTableHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-

-		// the complete merge of the table is not supported yet

-		// TODO rewrite/fix the spanning behavior when applied to both columns and rows (cells hidden under others)

-

-		// if(mergeOption.equals("Merge Table")) {

-		// resetSpan();

-		// bodyLayerStack.getBodyLayerSpanProvider().setAutoColumnSpan(true);

-		// bodyLayerStack.getBodyLayerSpanProvider().setAutoRowSpan(true);

-		//

-		// Integer[] testListColumn = { new Integer(11), new Integer(12), new Integer(13), new Integer(14) };

-		// Integer[] testListRow = { new Integer(0), new Integer(1), new Integer(2), new Integer(3), new Integer(4), new Integer(5) };

-		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningRowPositions(testListRow);

-		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningColumnPositions(testListColumn);

-		//

-		// refreshTable();

-		// }

-

-		return null;

-	}

-

+/*****************************************************************************
+ * 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:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+
+public class MergeTableHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// the complete merge of the table is not supported yet
+		// TODO rewrite/fix the spanning behavior when applied to both columns and rows (cells hidden under others)
+
+		// if(mergeOption.equals("Merge Table")) {
+		// resetSpan();
+		// bodyLayerStack.getBodyLayerSpanProvider().setAutoColumnSpan(true);
+		// bodyLayerStack.getBodyLayerSpanProvider().setAutoRowSpan(true);
+		//
+		// Integer[] testListColumn = { new Integer(11), new Integer(12), new Integer(13), new Integer(14) };
+		// Integer[] testListRow = { new Integer(0), new Integer(1), new Integer(2), new Integer(3), new Integer(4), new Integer(5) };
+		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningRowPositions(testListRow);
+		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningColumnPositions(testListColumn);
+		//
+		// refreshTable();
+		// }
+
+		return null;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
index 2a05efa2ace..abfa39f7415 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * Handler for the print table action

- *

- */

-public class PrintTableHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if (manager != null) {

-			manager.print();

-		}

-		return 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * Handler for the print table action
+ *
+ */
+public class PrintTableHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager manager = getCurrentNattableModelManager();
+		if (manager != null) {
+			manager.print();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
index 9bee87cbfd2..623079f41e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeRowsCommand;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.nebula.widgets.nattable.util.GCFactory;

-

-/**

- * Handler used to resize rows

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowAutoResizeHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			final NatTable natTable = eventData.getNatTable();

-			natTable.doCommand(new InitializeAutoResizeRowsCommand(natTable, eventData.getRowPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeRowsCommand;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.nebula.widgets.nattable.util.GCFactory;
+
+/**
+ * Handler used to resize rows
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowAutoResizeHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			final NatTable natTable = eventData.getNatTable();
+			natTable.doCommand(new InitializeAutoResizeRowsCommand(natTable, eventData.getRowPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
index 3877fc25923..040fe670ecb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * 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.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the element represented by the selected rows

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDestroyAxisElementHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final IAxisManager axisManager = getRowAxisManager();

-		NatEventData eventData = getNatEventData();

-		if (axisManager != null && eventData != null) {

-			axisManager.destroyAxisElement(getFullSelectedRowsIndex(eventData));

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		boolean enabled = false;

-		NatEventData eventData = getNatEventData();

-		final IAxisManager axisManager = getRowAxisManager();

-		if (isEnabled() && axisManager != null && eventData != null) {

-			final List<Integer> rows = getFullSelectedRowsIndex(eventData);

-			enabled = axisManager.canDestroyAxisElement(rows);

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the element represented by the selected rows
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDestroyAxisElementHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final IAxisManager axisManager = getRowAxisManager();
+		NatEventData eventData = getNatEventData();
+		if (axisManager != null && eventData != null) {
+			axisManager.destroyAxisElement(getFullSelectedRowsIndex(eventData));
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		boolean enabled = false;
+		NatEventData eventData = getNatEventData();
+		final IAxisManager axisManager = getRowAxisManager();
+		if (isEnabled() && axisManager != null && eventData != null) {
+			final List<Integer> rows = getFullSelectedRowsIndex(eventData);
+			enabled = axisManager.canDestroyAxisElement(rows);
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
index 41238e95218..ca2fb59232c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * 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.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the element represented by the selected rows

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDestroyAxisHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final IAxisManager axisManager = getRowAxisManager();

-		NatEventData eventData = getNatEventData();

-		if (axisManager != null && eventData!=null) {

-			axisManager.destroyAxis(getFullSelectedRowsIndex(eventData));

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		final IAxisManager axisManager = getRowAxisManager();

-		boolean enabled = false;

-		NatEventData eventData = getNatEventData();

-		if (isEnabled() && axisManager != null && eventData!=null) {

-			final List<Integer> rows = getFullSelectedRowsIndex(eventData);

-			enabled = axisManager.canDestroyAxis(rows);

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the element represented by the selected rows
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDestroyAxisHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final IAxisManager axisManager = getRowAxisManager();
+		NatEventData eventData = getNatEventData();
+		if (axisManager != null && eventData!=null) {
+			axisManager.destroyAxis(getFullSelectedRowsIndex(eventData));
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		final IAxisManager axisManager = getRowAxisManager();
+		boolean enabled = false;
+		NatEventData eventData = getNatEventData();
+		if (isEnabled() && axisManager != null && eventData!=null) {
+			final List<Integer> rows = getFullSelectedRowsIndex(eventData);
+			enabled = axisManager.canDestroyAxis(rows);
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
index 356802ccdf9..0645e0394f4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The handler to change the boolean value to display index header for row

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayIndexHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The handler to change the boolean value to display index header for row
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayIndexHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
index 18c89e2133d..82d278496a9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the text in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabeTextHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the text in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabeTextHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
index 62abf25605c..34b91dbae75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the "/" for derived feature in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureIsDerivedHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the "/" for derived feature in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureIsDerivedHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
index b851980ec8e..3b88402d253 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the feature multiplicity in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureMultiplicityHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the feature multiplicity in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureMultiplicityHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
index 0d29d7ef70f..9f557e46fa2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The handler to change the boolean value used to display the name of the feature in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureNameHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The handler to change the boolean value used to display the name of the feature in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureNameHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
index c39e09cf2c4..13c71e103bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the type of the feature in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureTypeHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the type of the feature in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureTypeHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
index afd4bd5d679..2efb4651518 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The handler to change the boolean value to display label header for row

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The handler to change the boolean value to display label header for row
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
index 9ce07b09447..c7716d75956 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the image in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelImageHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the image in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelImageHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
index 9635b57dc71..c91d70be62e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-

-//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2

-

-public class RowEditAliasHeaderHandler extends AbstractTableHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData!=null) {

-			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();

-			manager.openEditRowAliasDialog(eventData);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event

-		super.setEnabled(evaluationContext);

-		final NatEventData eventData = getNatEventData();

-		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();

-		if(isEnabled() && eventData!=null && manager!=null ){

-			setBaseEnabled(manager.canEditRowHeader(eventData));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+
+//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2
+
+public class RowEditAliasHeaderHandler extends AbstractTableHandler {
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData!=null) {
+			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();
+			manager.openEditRowAliasDialog(eventData);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event
+		super.setEnabled(evaluationContext);
+		final NatEventData eventData = getNatEventData();
+		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();
+		if(isEnabled() && eventData!=null && manager!=null ){
+			setBaseEnabled(manager.canEditRowHeader(eventData));
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
index 2f808544283..ea9785bd75f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013, 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.nattable.handler;

-

-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;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowMasterDisconnectColumnSlaveHandler extends AbstractDisconnectSlaveHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractAxisProvider getAxisProviderToEdit() {

-		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		if (currentNattableModelManager == null ) {

-			return null;

-		}

-		return AxisUtils.getAxisProviderUsedForRows(currentNattableModelManager);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 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.nattable.handler;
+
+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;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowMasterDisconnectColumnSlaveHandler extends AbstractDisconnectSlaveHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractAxisProvider getAxisProviderToEdit() {
+		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		if (currentNattableModelManager == null ) {
+			return null;
+		}
+		return AxisUtils.getAxisProviderUsedForRows(currentNattableModelManager);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java
index 04455e908e2..62c0a28fb02 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java
@@ -1,60 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-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.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to save the current axis provider, in this case for columns.

- *

- */

-public class SaveCurrentColumnAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {

-

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		INattableModelManager manager = this.getCurrentNattableModelManager();

-		if (manager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-

-		IAxisManager columnAxisManager = manager.getColumnAxisManager();

-		if (columnAxisManager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-		setBaseEnabled(columnAxisManager.canBeSavedAsConfig());

-	}

-

-	@Override

-	public AbstractAxisProvider getAxisProvider() {

-		return this.getCurrentNattableModelManager().getVerticalAxisProvider();

-	}

-

-	@Override

-	public EList<AbstractAxisProvider> getAxisProviderHistory() {

-		return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();

-	}

-

-	@Override

-	public EReference getAxisProviderHistoryEReference() {

-		return NattablePackage.eINSTANCE.getTable_ColumnAxisProvidersHistory();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+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.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to save the current axis provider, in this case for columns.
+ *
+ */
+public class SaveCurrentColumnAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		INattableModelManager manager = this.getCurrentNattableModelManager();
+		if (manager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+
+		IAxisManager columnAxisManager = manager.getColumnAxisManager();
+		if (columnAxisManager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+		setBaseEnabled(columnAxisManager.canBeSavedAsConfig());
+	}
+
+	@Override
+	public AbstractAxisProvider getAxisProvider() {
+		return this.getCurrentNattableModelManager().getVerticalAxisProvider();
+	}
+
+	@Override
+	public EList<AbstractAxisProvider> getAxisProviderHistory() {
+		return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();
+	}
+
+	@Override
+	public EReference getAxisProviderHistoryEReference() {
+		return NattablePackage.eINSTANCE.getTable_ColumnAxisProvidersHistory();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java
index 35ade0f472e..80f0a927f07 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-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.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to save the current axis provider, in this case for rows.

- *

- */

-public class SaveCurrentRowAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistoryEReference()

-	 *

-	 * @return

-	 */

-	@Override

-	public EReference getAxisProviderHistoryEReference() {

-		return NattablePackage.eINSTANCE.getTable_RowAxisProvidersHistory();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistory()

-	 *

-	 * @return

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getAxisProviderHistory() {

-		return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getAxisProvider() {

-		return this.getCurrentNattableModelManager().getHorizontalAxisProvider();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		INattableModelManager manager = this.getCurrentNattableModelManager();

-		if (manager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-

-		IAxisManager rowAxisManager = manager.getRowAxisManager();

-		if (rowAxisManager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-		setBaseEnabled(rowAxisManager.canBeSavedAsConfig());

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+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.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to save the current axis provider, in this case for rows.
+ *
+ */
+public class SaveCurrentRowAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistoryEReference()
+	 *
+	 * @return
+	 */
+	@Override
+	public EReference getAxisProviderHistoryEReference() {
+		return NattablePackage.eINSTANCE.getTable_RowAxisProvidersHistory();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistory()
+	 *
+	 * @return
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getAxisProviderHistory() {
+		return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getAxisProvider() {
+		return this.getCurrentNattableModelManager().getHorizontalAxisProvider();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		INattableModelManager manager = this.getCurrentNattableModelManager();
+		if (manager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+
+		IAxisManager rowAxisManager = manager.getRowAxisManager();
+		if (rowAxisManager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+		setBaseEnabled(rowAxisManager.canBeSavedAsConfig());
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
index 4ac1b62713f..c5829332308 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class SelectAllHandler extends AbstractTableHandler {

-

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if (manager != null) {

-			manager.selectAll();

-		}

-		return 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class SelectAllHandler extends AbstractTableHandler {
+
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager manager = getCurrentNattableModelManager();
+		if (manager != null) {
+			manager.selectAll();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
index f60084b62f9..2733ad6dcab 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2013, 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * Handler for the Create/Destroy columns Papyrus version

- *

- */

-public class SelectColumnsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();

-		currentNattableModelManager.openCreateDestroyColumnsManagerDialog();

-		return event;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (currentNattableModelManager != null) {

-			enabled = currentNattableModelManager.canCreateDestroyColumnsAxis();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * Handler for the Create/Destroy columns Papyrus version
+ *
+ */
+public class SelectColumnsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();
+		currentNattableModelManager.openCreateDestroyColumnsManagerDialog();
+		return event;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (currentNattableModelManager != null) {
+			enabled = currentNattableModelManager.canCreateDestroyColumnsAxis();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
index de63d6866ad..93abe95629a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2013, 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * Handler for the Create/Destroy columns Papyrus version

- *

- */

-public class SelectRowsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();

-		currentNattableModelManager.openCreateDestroyRowsManagerDialog();

-		return event;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (currentNattableModelManager != null) {

-			enabled = currentNattableModelManager.canCreateDestroyRowsAxis();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * Handler for the Create/Destroy columns Papyrus version
+ *
+ */
+public class SelectRowsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();
+		currentNattableModelManager.openCreateDestroyRowsManagerDialog();
+		return event;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (currentNattableModelManager != null) {
+			enabled = currentNattableModelManager.canCreateDestroyRowsAxis();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
index 33f567921ed..2299a1dccec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-

-/**

- * Handler used to sort the columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class SortColumnsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean alphabeticOrder = "true".equals(directionParameter);

-		manager.sortColumnsByName(alphabeticOrder);

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (manager != null) {

-			enabled = manager.canMoveColumns();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+
+/**
+ * Handler used to sort the columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class SortColumnsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean alphabeticOrder = "true".equals(directionParameter);
+		manager.sortColumnsByName(alphabeticOrder);
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (manager != null) {
+			enabled = manager.canMoveColumns();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
index 836618768cd..4e956ab4eeb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-

-/**

- * The handler for the sort rows action

- *

- * @author Vincent Lorenzo

- *

- */

-public class SortRowsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean alphabeticOrder = Boolean.TRUE.toString().equals(directionParameter);

-		manager.sortRowsByName(alphabeticOrder);

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (manager != null) {

-			enabled = manager.canMoveColumns();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+
+/**
+ * The handler for the sort rows action
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class SortRowsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean alphabeticOrder = Boolean.TRUE.toString().equals(directionParameter);
+		manager.sortRowsByName(alphabeticOrder);
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (manager != null) {
+			enabled = manager.canMoveColumns();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
index f5f38437e46..77be36fcfcc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-

-

-

-public class TreeRowHideAllCategoriesCommandHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());

-

-		Table table = getTable();

-		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		CompoundCommand cc = new CompoundCommand("Hide All categories Command"); //$NON-NLS-1$

-		if (values == null) {

-			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();

-			cc.append(AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values)));

-			cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));

-		}

-		final List<Integer> toHide = new ArrayList<Integer>();

-		int start = 0;

-		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			start = 1;

-		}

-		for (int i = start; i <= maxDepth; i++) {

-			toHide.add(Integer.valueOf(i));

-		}

-

-		cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide));

-		getTableEditingDomain().getCommandStack().execute(cc);

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (allCategoriesAreCurrentlyHidden()) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+
+
+
+public class TreeRowHideAllCategoriesCommandHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());
+
+		Table table = getTable();
+		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		CompoundCommand cc = new CompoundCommand("Hide All categories Command"); //$NON-NLS-1$
+		if (values == null) {
+			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();
+			cc.append(AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values)));
+			cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));
+		}
+		final List<Integer> toHide = new ArrayList<Integer>();
+		int start = 0;
+		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			start = 1;
+		}
+		for (int i = start; i <= maxDepth; i++) {
+			toHide.add(Integer.valueOf(i));
+		}
+
+		cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide));
+		getTableEditingDomain().getCommandStack().execute(cc);
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (allCategoriesAreCurrentlyHidden()) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java
index 8690edb2d9f..9d9c01c53a6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-

-

-/**

- *

- * The handler used to hide all categories

- *

- */

-public class TreeRowHideAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());

-		Table table = getTable();

-

-		// 1. obtain the list of feature to hide

-		final List<Integer> toHide = new ArrayList<Integer>();

-		int start = 0;

-		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			start = 1;

-		}

-		for (int i = start; i <= maxDepth; i++) {

-			toHide.add(Integer.valueOf(i));

-		}

-

-		IntListValueStyle values = StyleUtils.getHiddenDepthsValueStyle(table);

-		Command cmd;

-		if (values == null) {

-			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();

-			values.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-			values.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);

-			cmd = AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values));

-

-			// cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));

-		} else {

-			toHide.removeAll(values.getIntListValue());

-			if (toHide.isEmpty()) {

-				return null;

-			}

-

-			// here we don't manage the order of the hidden category, because it is not important + to manage it we will receive more than 1 notification in UpdateTableContentListener AND we don't want that

-			cmd = AddCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);

-		}

-		getTableEditingDomain().getCommandStack().execute(cmd);

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (allCategoriesAreCurrentlyHidden()) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+
+
+/**
+ *
+ * The handler used to hide all categories
+ *
+ */
+public class TreeRowHideAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());
+		Table table = getTable();
+
+		// 1. obtain the list of feature to hide
+		final List<Integer> toHide = new ArrayList<Integer>();
+		int start = 0;
+		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			start = 1;
+		}
+		for (int i = start; i <= maxDepth; i++) {
+			toHide.add(Integer.valueOf(i));
+		}
+
+		IntListValueStyle values = StyleUtils.getHiddenDepthsValueStyle(table);
+		Command cmd;
+		if (values == null) {
+			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();
+			values.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+			values.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);
+			cmd = AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values));
+
+			// cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));
+		} else {
+			toHide.removeAll(values.getIntListValue());
+			if (toHide.isEmpty()) {
+				return null;
+			}
+
+			// here we don't manage the order of the hidden category, because it is not important + to manage it we will receive more than 1 notification in UpdateTableContentListener AND we don't want that
+			cmd = AddCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);
+		}
+		getTableEditingDomain().getCommandStack().execute(cmd);
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (allCategoriesAreCurrentlyHidden()) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java
index c2a385be41a..5b3c3ce26c2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java
@@ -1,137 +1,137 @@
-/*****************************************************************************

- * 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.handler;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class TreeRowHideShowCategoryHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 * Boolean parameter : <code>true</code> to hide and <code>false</code> to show

-	 */

-	public static final String HIDE_CATEGORY_PARAMETER_KEY = "hideCategory"; //$NON-NLS-1$

-

-	/**

-	 * the depth on which we are working

-	 */

-	public static final String DEPTH_PARAMETER_KEY = "depth"; //$NON-NLS-1$

-

-	/**

-	 * the id of the command managed by this handler

-	 */

-	public static final String COMMAND_ID = "org.eclipse.papyrus.infra.nattable.row.show.hide.category.command"; //$NON-NLS-1$

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		Boolean hide = (Boolean) arg0.getParameters().get(HIDE_CATEGORY_PARAMETER_KEY);

-		Integer depth = (Integer) arg0.getParameters().get(DEPTH_PARAMETER_KEY);

-		if (hide) {

-			hideCategory(depth);

-		} else {

-			showCategory(depth);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param depth

-	 *            the depth to hide

-	 */

-	protected void hideCategory(Integer depth) {

-		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());

-		if (style != null && style.getIntListValue().contains(depth)) {

-			return;

-		}

-		if (depth == 0 && !FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			return;

-		}

-

-

-		if (style == null) {

-			style = NattablestyleFactory.eINSTANCE.createIntListValueStyle();

-			style.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-			style.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), Collections.singleton(depth));

-			Command cmd = AddCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(style));

-			getTableEditingDomain().getCommandStack().execute(cmd);

-			return;

-		}

-

-		List<Integer> allValues = new ArrayList<Integer>();

-		if (style != null) {

-			allValues.addAll(style.getIntListValue());

-		}

-

-		if (allValues.contains(depth)) {

-			// nothing to do

-			return;

-		}

-		allValues.add(depth);

-		Collections.sort(allValues);

-		int index = allValues.indexOf(depth);

-		Command cmd = AddCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth, index);

-		getTableEditingDomain().getCommandStack().execute(cmd);

-

-

-	}

-

-	/**

-	 *

-	 * @param depth

-	 *            the depth to show

-	 */

-	protected void showCategory(Integer depth) {

-		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());

-		if (style == null) {

-			return;

-		}

-		List<Integer> newValues = new ArrayList<Integer>(new HashSet<Integer>(style.getIntListValue()));

-		newValues.remove(depth);

-		Command cmd;

-		if (newValues.isEmpty()) {

-			cmd = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), style);

-		} else {

-			cmd = RemoveCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth);

-		}

-		getTableEditingDomain().getCommandStack().execute(cmd);

-	}

-

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeRowHideShowCategoryHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 * Boolean parameter : <code>true</code> to hide and <code>false</code> to show
+	 */
+	public static final String HIDE_CATEGORY_PARAMETER_KEY = "hideCategory"; //$NON-NLS-1$
+
+	/**
+	 * the depth on which we are working
+	 */
+	public static final String DEPTH_PARAMETER_KEY = "depth"; //$NON-NLS-1$
+
+	/**
+	 * the id of the command managed by this handler
+	 */
+	public static final String COMMAND_ID = "org.eclipse.papyrus.infra.nattable.row.show.hide.category.command"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		Boolean hide = (Boolean) arg0.getParameters().get(HIDE_CATEGORY_PARAMETER_KEY);
+		Integer depth = (Integer) arg0.getParameters().get(DEPTH_PARAMETER_KEY);
+		if (hide) {
+			hideCategory(depth);
+		} else {
+			showCategory(depth);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param depth
+	 *            the depth to hide
+	 */
+	protected void hideCategory(Integer depth) {
+		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());
+		if (style != null && style.getIntListValue().contains(depth)) {
+			return;
+		}
+		if (depth == 0 && !FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			return;
+		}
+
+
+		if (style == null) {
+			style = NattablestyleFactory.eINSTANCE.createIntListValueStyle();
+			style.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+			style.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), Collections.singleton(depth));
+			Command cmd = AddCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(style));
+			getTableEditingDomain().getCommandStack().execute(cmd);
+			return;
+		}
+
+		List<Integer> allValues = new ArrayList<Integer>();
+		if (style != null) {
+			allValues.addAll(style.getIntListValue());
+		}
+
+		if (allValues.contains(depth)) {
+			// nothing to do
+			return;
+		}
+		allValues.add(depth);
+		Collections.sort(allValues);
+		int index = allValues.indexOf(depth);
+		Command cmd = AddCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth, index);
+		getTableEditingDomain().getCommandStack().execute(cmd);
+
+
+	}
+
+	/**
+	 *
+	 * @param depth
+	 *            the depth to show
+	 */
+	protected void showCategory(Integer depth) {
+		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());
+		if (style == null) {
+			return;
+		}
+		List<Integer> newValues = new ArrayList<Integer>(new HashSet<Integer>(style.getIntListValue()));
+		newValues.remove(depth);
+		Command cmd;
+		if (newValues.isEmpty()) {
+			cmd = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), style);
+		} else {
+			cmd = RemoveCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth);
+		}
+		getTableEditingDomain().getCommandStack().execute(cmd);
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java
index a173a73e71b..e79d391c09e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class TreeRowShowAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IntListValueStyle values = (IntListValueStyle) getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		if (values != null) {

-			Command c = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), values);

-			getTableEditingDomain().getCommandStack().execute(c);

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (allCategoriesAreCurrentlyVisible()) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeRowShowAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IntListValueStyle values = (IntListValueStyle) getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		if (values != null) {
+			Command c = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), values);
+			getTableEditingDomain().getCommandStack().execute(c);
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (allCategoriesAreCurrentlyVisible()) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
index a983004a948..78f230db8bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * 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.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class TreeRowShowHideCategoryCommandHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-

-

-		// TODO not yet used

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeRowShowHideCategoryCommandHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+
+
+		// TODO not yet used
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
index 176dbc79002..0740a6f5635 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
@@ -1,22 +1,22 @@
-/*****************************************************************************

- * 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.helper.advice;

-

-

-public class DestroyTableAdviceHelper {

-

-	public DestroyTableAdviceHelper() {

-	}

-

-}

+/*****************************************************************************
+ * 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.helper.advice;
+
+
+public class DestroyTableAdviceHelper {
+
+	public DestroyTableAdviceHelper() {
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
index ab0b519a71c..352f92d1684 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
@@ -1,116 +1,116 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2017 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

- *  Thanh Liem PHAn (ALL4TEC) thanhliem.phan@all4tec.net - Bug 525245

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-

-/**

- *

- * This helper allows to destroy table elements when a destroy element is referenced by a table

- *

- */

-public class TableContentsAdviceHelper extends AbstractEditHelperAdvice {

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-		final EObject destroyedElement = request.getElementToDestroy();

-		return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));

-		// return null;

-	}

-

-	@Override

-	protected ICommand getAfterDestroyDependentsCommand(DestroyDependentsRequest request) {

-		// final EObject destroyedElement = request.getElementToDestroy();

-		// return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));

-		return null;

-	}

-

-	/**

-	 *

-	 * @param eobject

-	 *            the destroyed element

-	 * @return

-	 *         the associated element to destroy in the same time than the eobject

-	 */

-	protected List<EObject> getAssociatedElementToDestroy(final EObject eobject) {

-		final CrossReferenceAdapter adapter = getCrossReferenceAdapter(eobject);

-		if (adapter != null) {

-			Set<EObject> elementsToDestroy = adapter.getInverseReferencers(eobject, NattableaxisPackage.eINSTANCE.getEObjectAxis_Element(), NattableaxisPackage.eINSTANCE.getEObjectAxis());

-			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), NattablecellPackage.eINSTANCE.getEObjectAxisWrapper()));

-			// Bug 525245: EObjectWrapper, which wraps destroyed element such as row source or column source, need to be also deleted

-			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablewrapperPackage.eINSTANCE.getEObjectWrapper_Element(), NattablewrapperPackage.eINSTANCE.getEObjectWrapper()));

-

-			if (eobject instanceof ICellAxisWrapper) {

-				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_RowWrapper(), NattablecellPackage.eINSTANCE.getCell()));

-				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_ColumnWrapper(), NattablecellPackage.eINSTANCE.getCell()));

-			}

-			// for(final EObject current : cellWrapper) {

-			// if(current instanceof ICellAxisWrapper) {

-			// elementsToDestroy.add(current.eContainer());

-			// }

-			// }

-			return new ArrayList<EObject>(elementsToDestroy);

-		}

-		return Collections.emptyList();

-	}

-

-	// Duplicated code from UML Diagram common

-	/**

-	 * Returns the {@link CrossReferenceAdapter} corresponding to an {@link EObject}

-	 *

-	 * @param element

-	 *            the {@link EObject} element

-	 * @return the {@link CrossReferenceAdapter} corresponding to element

-	 */

-	public static CrossReferenceAdapter getCrossReferenceAdapter(final EObject element) {

-		CrossReferenceAdapter crossReferenceAdapter = CrossReferenceAdapter.getExistingCrossReferenceAdapter(element);

-		if (crossReferenceAdapter == null) {

-

-			TransactionalEditingDomain domain = null;

-			try {

-				domain = ServiceUtilsForEObject.getInstance().getService(TransactionalEditingDomain.class, element);

-			} catch (ServiceException e) {

-				// Activator.log.error(e); //it is not an error, it is possible to not have service registry

-			}

-			if (domain != null) {

-				crossReferenceAdapter = CrossReferenceAdapter.getCrossReferenceAdapter(domain.getResourceSet());

-			}

-		}

-

-		return crossReferenceAdapter;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2017 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
+ *  Thanh Liem PHAn (ALL4TEC) thanhliem.phan@all4tec.net - Bug 525245
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.helper.advice;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+
+/**
+ *
+ * This helper allows to destroy table elements when a destroy element is referenced by a table
+ *
+ */
+public class TableContentsAdviceHelper extends AbstractEditHelperAdvice {
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
+		final EObject destroyedElement = request.getElementToDestroy();
+		return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));
+		// return null;
+	}
+
+	@Override
+	protected ICommand getAfterDestroyDependentsCommand(DestroyDependentsRequest request) {
+		// final EObject destroyedElement = request.getElementToDestroy();
+		// return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));
+		return null;
+	}
+
+	/**
+	 *
+	 * @param eobject
+	 *            the destroyed element
+	 * @return
+	 *         the associated element to destroy in the same time than the eobject
+	 */
+	protected List<EObject> getAssociatedElementToDestroy(final EObject eobject) {
+		final CrossReferenceAdapter adapter = getCrossReferenceAdapter(eobject);
+		if (adapter != null) {
+			Set<EObject> elementsToDestroy = adapter.getInverseReferencers(eobject, NattableaxisPackage.eINSTANCE.getEObjectAxis_Element(), NattableaxisPackage.eINSTANCE.getEObjectAxis());
+			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), NattablecellPackage.eINSTANCE.getEObjectAxisWrapper()));
+			// Bug 525245: EObjectWrapper, which wraps destroyed element such as row source or column source, need to be also deleted
+			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablewrapperPackage.eINSTANCE.getEObjectWrapper_Element(), NattablewrapperPackage.eINSTANCE.getEObjectWrapper()));
+
+			if (eobject instanceof ICellAxisWrapper) {
+				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_RowWrapper(), NattablecellPackage.eINSTANCE.getCell()));
+				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_ColumnWrapper(), NattablecellPackage.eINSTANCE.getCell()));
+			}
+			// for(final EObject current : cellWrapper) {
+			// if(current instanceof ICellAxisWrapper) {
+			// elementsToDestroy.add(current.eContainer());
+			// }
+			// }
+			return new ArrayList<EObject>(elementsToDestroy);
+		}
+		return Collections.emptyList();
+	}
+
+	// Duplicated code from UML Diagram common
+	/**
+	 * Returns the {@link CrossReferenceAdapter} corresponding to an {@link EObject}
+	 *
+	 * @param element
+	 *            the {@link EObject} element
+	 * @return the {@link CrossReferenceAdapter} corresponding to element
+	 */
+	public static CrossReferenceAdapter getCrossReferenceAdapter(final EObject element) {
+		CrossReferenceAdapter crossReferenceAdapter = CrossReferenceAdapter.getExistingCrossReferenceAdapter(element);
+		if (crossReferenceAdapter == null) {
+
+			TransactionalEditingDomain domain = null;
+			try {
+				domain = ServiceUtilsForEObject.getInstance().getService(TransactionalEditingDomain.class, element);
+			} catch (ServiceException e) {
+				// Activator.log.error(e); //it is not an error, it is possible to not have service registry
+			}
+			if (domain != null) {
+				crossReferenceAdapter = CrossReferenceAdapter.getCrossReferenceAdapter(domain.getResourceSet());
+			}
+		}
+
+		return crossReferenceAdapter;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
index a18dad62f8c..d4c84bc9dfc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
@@ -1,150 +1,150 @@
-/*****************************************************************************

- * 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.layerstack;

-

-import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.AutomaticSpanningDataProvider;

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;

-import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;

-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;

-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;

-import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;

-import org.eclipse.nebula.widgets.nattable.selection.ITraversalStrategy;

-import org.eclipse.nebula.widgets.nattable.selection.MoveCellSelectionCommandHandler;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;

-import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;

-import org.eclipse.papyrus.infra.nattable.configuration.StyleConfiguration;

-import org.eclipse.papyrus.infra.nattable.layer.PapyrusSelectionLayer;

-import org.eclipse.papyrus.infra.nattable.layer.PapyrusSpanningDataLayer;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.reorder.CustomDefaultColumnReorderBindings;

-import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-import org.eclipse.swt.SWT;

-

-

-/**

- * The BodyLayer stack used in Papyrus TableF

- *

- * @author Vincent Lorenzo

- *

- */

-public class BodyLayerStack extends AbstractLayerTransform {

-

-	private final SelectionLayer selectionLayer;

-

-	private final DataLayer bodyDataLayer;

-

-	private final ViewportLayer viewportLayer;

-

-	private final ColumnHideShowLayer columnHideShowLayer;

-

-	private final ColumnReorderLayer columnReorderLayer;

-

-	private final RowHideShowLayer rowHideShowLayer;

-

-	// private final RowReorderLayer rowReoderLayer;

-

-	private AutomaticSpanningDataProvider spanProvider;

-

-	public BodyLayerStack(final IDataProvider dataProvider, final INattableModelManager manager) {

-		// this.bodyDataLayer = new DataLayer(dataProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());

-

-		// this method is used to merge the cells of same value inside a table

-		spanProvider = new AutomaticSpanningDataProvider(dataProvider, false, false) {

-

-			@Override

-			protected boolean valuesNotEqual(Object value1, Object value2) {

-				if (value1 == value2) { // works for both null and not

-					return false;

-				}

-				if ((value1 == null && value2 != null) || (value1 != null && value2 == null)) {

-					return true;

-				}

-				return !value1.equals(value2);

-			}

-		};

-

-		this.bodyDataLayer = new PapyrusSpanningDataLayer(TableEditingDomainUtils.getTableContextEditingDomain(manager.getTable()), manager, spanProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());

-

-		this.bodyDataLayer.addConfiguration(new StyleConfiguration());

-

-		this.columnReorderLayer = new ColumnReorderLayer(this.bodyDataLayer, false);

-

-		// we register a custom configuration to manage the case where the reorder is forbidden

-		this.columnReorderLayer.addConfiguration(new CustomDefaultColumnReorderBindings(manager));

-

-

-		// to allow the reorder on the lines

-		// this.rowReoderLayer = null;

-		// this.rowReoderLayer = new RowReorderLayer(columnReorderLayer);

-		// this.columnHideShowLayer = new ColumnHideShowLayer(this.rowReoderLayer);

-

-		this.columnHideShowLayer = new ColumnHideShowLayer(this.columnReorderLayer);

-		

-		this.rowHideShowLayer = new RowHideShowLayer(columnHideShowLayer);

-		this.selectionLayer = new PapyrusSelectionLayer(rowHideShowLayer);

-		this.viewportLayer = new ViewportLayer(this.selectionLayer);

-		setUnderlyingLayer(this.viewportLayer);

-		setRegionName(GridRegion.BODY);

-		

-		//bug 476658

-		viewportLayer.registerCommandHandler( new MoveCellSelectionCommandHandler( selectionLayer, ITraversalStrategy.TABLE_CYCLE_TRAVERSAL_STRATEGY));

-	}

-

-	public SelectionLayer getSelectionLayer() {

-		return this.selectionLayer;

-	}

-

-	public DataLayer getBodyDataLayer() {

-		return this.bodyDataLayer;

-	}

-

-	public ViewportLayer getViewportLayer() {

-		return this.viewportLayer;

-	}

-

-	public ColumnHideShowLayer getColumnHideShowLayer() {

-		return this.columnHideShowLayer;

-	}

-

-	public ColumnReorderLayer getColumnReorderLayer() {

-		return this.columnReorderLayer;

-	}

-

-	public RowHideShowLayer getRowHideShowLayer() {

-		return this.rowHideShowLayer;

-	}

-

-	@Override

-	public void configure(ConfigRegistry configRegistry, UiBindingRegistry uiBindingRegistry) {

-		super.configure(configRegistry, uiBindingRegistry);

-		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());

-		// configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, IEditableRule.ALWAYS_EDITABLE);

-		// uiBindingRegistry.registerKeyBinding(new Mouse, new KeyEditAction());

-		// uiBindingRegistry.

-		// configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter(), DisplayMode.NORMAL, GridRegion.BODY);

-	}

-

-

-	public AutomaticSpanningDataProvider getBodyLayerSpanProvider() {

-		return this.spanProvider;

-

-	}

-}

+/*****************************************************************************
+ * 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.layerstack;
+
+import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.AutomaticSpanningDataProvider;
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;
+import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
+import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;
+import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
+import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;
+import org.eclipse.nebula.widgets.nattable.selection.ITraversalStrategy;
+import org.eclipse.nebula.widgets.nattable.selection.MoveCellSelectionCommandHandler;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;
+import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;
+import org.eclipse.papyrus.infra.nattable.configuration.StyleConfiguration;
+import org.eclipse.papyrus.infra.nattable.layer.PapyrusSelectionLayer;
+import org.eclipse.papyrus.infra.nattable.layer.PapyrusSpanningDataLayer;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.reorder.CustomDefaultColumnReorderBindings;
+import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.swt.SWT;
+
+
+/**
+ * The BodyLayer stack used in Papyrus TableF
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class BodyLayerStack extends AbstractLayerTransform {
+
+	private final SelectionLayer selectionLayer;
+
+	private final DataLayer bodyDataLayer;
+
+	private final ViewportLayer viewportLayer;
+
+	private final ColumnHideShowLayer columnHideShowLayer;
+
+	private final ColumnReorderLayer columnReorderLayer;
+
+	private final RowHideShowLayer rowHideShowLayer;
+
+	// private final RowReorderLayer rowReoderLayer;
+
+	private AutomaticSpanningDataProvider spanProvider;
+
+	public BodyLayerStack(final IDataProvider dataProvider, final INattableModelManager manager) {
+		// this.bodyDataLayer = new DataLayer(dataProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());
+
+		// this method is used to merge the cells of same value inside a table
+		spanProvider = new AutomaticSpanningDataProvider(dataProvider, false, false) {
+
+			@Override
+			protected boolean valuesNotEqual(Object value1, Object value2) {
+				if (value1 == value2) { // works for both null and not
+					return false;
+				}
+				if ((value1 == null && value2 != null) || (value1 != null && value2 == null)) {
+					return true;
+				}
+				return !value1.equals(value2);
+			}
+		};
+
+		this.bodyDataLayer = new PapyrusSpanningDataLayer(TableEditingDomainUtils.getTableContextEditingDomain(manager.getTable()), manager, spanProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());
+
+		this.bodyDataLayer.addConfiguration(new StyleConfiguration());
+
+		this.columnReorderLayer = new ColumnReorderLayer(this.bodyDataLayer, false);
+
+		// we register a custom configuration to manage the case where the reorder is forbidden
+		this.columnReorderLayer.addConfiguration(new CustomDefaultColumnReorderBindings(manager));
+
+
+		// to allow the reorder on the lines
+		// this.rowReoderLayer = null;
+		// this.rowReoderLayer = new RowReorderLayer(columnReorderLayer);
+		// this.columnHideShowLayer = new ColumnHideShowLayer(this.rowReoderLayer);
+
+		this.columnHideShowLayer = new ColumnHideShowLayer(this.columnReorderLayer);
+		
+		this.rowHideShowLayer = new RowHideShowLayer(columnHideShowLayer);
+		this.selectionLayer = new PapyrusSelectionLayer(rowHideShowLayer);
+		this.viewportLayer = new ViewportLayer(this.selectionLayer);
+		setUnderlyingLayer(this.viewportLayer);
+		setRegionName(GridRegion.BODY);
+		
+		//bug 476658
+		viewportLayer.registerCommandHandler( new MoveCellSelectionCommandHandler( selectionLayer, ITraversalStrategy.TABLE_CYCLE_TRAVERSAL_STRATEGY));
+	}
+
+	public SelectionLayer getSelectionLayer() {
+		return this.selectionLayer;
+	}
+
+	public DataLayer getBodyDataLayer() {
+		return this.bodyDataLayer;
+	}
+
+	public ViewportLayer getViewportLayer() {
+		return this.viewportLayer;
+	}
+
+	public ColumnHideShowLayer getColumnHideShowLayer() {
+		return this.columnHideShowLayer;
+	}
+
+	public ColumnReorderLayer getColumnReorderLayer() {
+		return this.columnReorderLayer;
+	}
+
+	public RowHideShowLayer getRowHideShowLayer() {
+		return this.rowHideShowLayer;
+	}
+
+	@Override
+	public void configure(ConfigRegistry configRegistry, UiBindingRegistry uiBindingRegistry) {
+		super.configure(configRegistry, uiBindingRegistry);
+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());
+		// configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, IEditableRule.ALWAYS_EDITABLE);
+		// uiBindingRegistry.registerKeyBinding(new Mouse, new KeyEditAction());
+		// uiBindingRegistry.
+		// configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter(), DisplayMode.NORMAL, GridRegion.BODY);
+	}
+
+
+	public AutomaticSpanningDataProvider getBodyLayerSpanProvider() {
+		return this.spanProvider;
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
index aae076b6701..bad9cf6f574 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
@@ -1,346 +1,346 @@
-/*****************************************************************************

- * 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.layerstack;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.grid.layer.RowHeaderLayer;

-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayer;

-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;

-import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;

-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowHeaderStyleConfiguration;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowResizeBindingsConfiguration;

-import org.eclipse.papyrus.infra.nattable.dataprovider.RowIndexHeaderDataProvider;

-import org.eclipse.papyrus.infra.nattable.dataprovider.RowLabelHeaderDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;

-import org.eclipse.swt.SWT;

-

-/**

- *

- * @author Vincent Lorenzo

- *         Layer stack used for row header

- */

-public class RowHeaderLayerStack extends AbstractLayerTransform {

-

-	/**

-	 * Default columns width

-	 */

-	public static final int DEFAULT_COLUMN_WIDTH = 150;

-

-	/**

-	 * default rows height

-	 */

-	public static final int DEFAULT_ROW_HEIGHT = DefaultSizeUtils.getDefaultCellWidth();

-

-	/**

-	 * the table manager

-	 */

-	protected final INattableModelManager tableManager;

-	/**

-	 * the composite layer

-	 */

-	protected final CompositeLayer compositeLayer;

-

-	/**

-	 * the index data layer

-	 */

-	protected final DataLayer indexDataLayer;

-

-	/**

-	 * the label data layer

-	 */

-	protected final DataLayer labelDataLayer;

-

-	/**

-	 * the row header layer index

-	 */

-	private final AbstractLayer indexRowHeaderLayer;

-

-	/**

-	 * the row header layer label

-	 */

-	protected final AbstractLayer labelRowHeaderLayer;

-	/**

-	 * the label data provider

-	 */

-	protected final IDataProvider indexDataProvider;

-

-	/**

-	 * the index data provider

-	 */

-	protected final IDataProvider labelDataProvider;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param bodyLayer

-	 * @deprecated use the other constructor

-	 */

-	@Deprecated

-	public RowHeaderLayerStack(final IDataProvider dataProvider, final BodyLayerStack bodyLayer) {

-		final DataLayer dataLayer = new DataLayer(dataProvider, RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);

-		// I know that selection layer is probably false

-		final RowHeaderLayer rowHeaderLayer = new RowHeaderLayer(dataLayer, bodyLayer, /* bodyLayer.getSelectionLayer() */new SelectionLayer(dataLayer), false);

-		rowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());

-		// Did not work ! Needed : Have the same type of cell in row and column headers

-		rowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());

-		// final IConfiguration configuration = new CustomConfig();

-		// setUnderlyingLayer(sortHeaderLayer);

-		// rowHeaderLayer.addConfiguration(configuration);

-		// rowHeaderLayer.addConfiguration(new RowOnlySelectionBindings());

-		setUnderlyingLayer(rowHeaderLayer);

-		setRegionName(GridRegion.ROW_HEADER);

-		this.labelRowHeaderLayer = null;

-		this.indexRowHeaderLayer = null;

-		this.tableManager = null;

-		this.labelDataProvider = null;

-		this.indexDataProvider = null;

-		this.indexDataLayer = null;

-		this.labelDataLayer = null;

-		this.compositeLayer = null;

-	}

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param bodyLayerStack

-	 *            the body layer

-	 */

-	public RowHeaderLayerStack(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {

-		this.tableManager = tableManager;

-		// 1. create the data provider

-		this.indexDataProvider = createIndexDataProvider();

-		this.labelDataProvider = createLabelDataProvider();

-

-		// 2. create the data layer

-		this.indexDataLayer = createIndexDataLayer();

-		this.labelDataLayer = createLabelDataLayer();

-

-		// 3. create the row header layer

-		this.indexRowHeaderLayer = createIndexRowHeaderLayer(bodyLayerStack, tableManager);

-		this.labelRowHeaderLayer = createLabelRowHeaderLayer(bodyLayerStack, tableManager);

-

-		// 3.1 configure layer

-		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());

-		this.indexRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);

-		this.labelRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);

-

-		// 4. create the composite layer

-		this.compositeLayer = new CompositeLayer(2, 1);

-		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, indexRowHeaderLayer, 0, 0);

-		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, labelRowHeaderLayer, 1, 0);

-

-		// 3. configure the layer

-		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());

-		this.compositeLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());

-		this.compositeLayer.setRegionName(GridRegion.ROW_HEADER);

-		setUnderlyingLayer(compositeLayer);

-		setRegionName(GridRegion.ROW_HEADER);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label data provider to use

-	 */

-	protected IDataProvider createLabelDataProvider() {

-		return new RowLabelHeaderDataProvider(this.tableManager);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the index data provider to use

-	 */

-	protected IDataProvider createIndexDataProvider() {

-		return new RowIndexHeaderDataProvider(this.tableManager);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label data provider to use

-	 */

-	public IDataProvider getLabelDataProvider() {

-		return this.labelDataProvider;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the index data provider to use

-	 */

-	public IDataProvider getIndexDataProvider() {

-		return this.indexDataProvider;

-	}

-

-	/**

-	 *

-	 * @param bodyLayerStack

-	 * @param tableManager

-	 * @return

-	 */

-	protected AbstractLayer createIndexRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {

-		RowHeaderLayer layer = new RowHeaderLayer(getIndexDataLayer(), bodyLayerStack, bodyLayerStack.getSelectionLayer(), false);

-		return layer;

-	}

-

-	/**

-	 *

-	 * @param bodyLayerStack

-	 * @param tableManager

-	 * @return

-	 */

-	protected AbstractLayer createLabelRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {

-		return new RowHeaderLayer(getLabelDataLayer(), bodyLayerStack.getViewportLayer(), bodyLayerStack.getSelectionLayer(), false);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the index row layer to use

-	 */

-	public final AbstractLayer getIndexRowHeaderLayer() {

-		return this.indexRowHeaderLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label row layer to use

-	 */

-	public final AbstractLayer getLabelRowHeaderLayer() {

-		return this.labelRowHeaderLayer;

-	}

-

-	/**

-	 * @param createLabelDataProvider

-	 * @return

-	 */

-	protected DataLayer createLabelDataLayer() {

-		return new DataLayer(getLabelDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);

-	}

-

-	/**

-	 * @param createLabelDataProvider

-	 * @return

-	 */

-	public final DataLayer getLabelDataLayer() {

-		return this.labelDataLayer;

-	}

-

-

-	/**

-	 * @param createIndexDataProvider

-	 * @return

-	 */

-	protected DataLayer createIndexDataLayer() {

-		return new DataLayer(getIndexDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);

-	}

-

-	/**

-	 * @param createIndexDataProvider

-	 * @return

-	 */

-	public final DataLayer getIndexDataLayer() {

-		return this.indexDataLayer;

-	}

-

-

-	/**

-	 *

-	 * @author Vincent Lorenzo

-	 *         Configuration providing the selection binding

-	 */

-	public static class CustomConfig extends DefaultSelectionBindings {

-

-

-		/**

-		 *

-		 * @see org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings#configureRowHeaderMouseClickBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-		 *

-		 * @param uiBindingRegistry

-		 */

-		@Override

-		protected void configureRowHeaderMouseClickBindings(final UiBindingRegistry uiBindingRegistry) {

-			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new MouseEditAction());

-		}

-	}

-

-

-	// public static class ReoderRowConfid extends AbstractUiBindingConfiguration {// This configuration should be added by the same kind of layer that DefaultColumnReorderLayerConfiguration but for row!

-	//

-	// @Override

-	// public void configureUiBindings(final UiBindingRegistry uiBindingRegistry) {

-	// uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.rowHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CellDragMode(), new RowReorderDragMode()));

-	// }

-	// }

-

-	/**

-	 *

-	 * @return

-	 *         the index data layer

-	 */

-	public DataLayer getRowIndexDataLayer() {

-		return indexDataLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label data layer

-	 */

-	public DataLayer getRowLabelDataLayer() {

-		return labelDataLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the row header layer index

-	 */

-	public AbstractLayer getRowHeaderLayerIndex() {

-		return this.indexRowHeaderLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the row header layer label

-	 */

-	public AbstractLayer getRowHeaderLayerLabel() {

-		return this.labelRowHeaderLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the composite layer

-	 */

-	public CompositeLayer getCompositeLayer() {

-		return this.compositeLayer;

-	}

-}

+/*****************************************************************************
+ * 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.layerstack;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.grid.layer.RowHeaderLayer;
+import org.eclipse.nebula.widgets.nattable.layer.AbstractLayer;
+import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;
+import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;
+import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
+import org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowHeaderStyleConfiguration;
+import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowResizeBindingsConfiguration;
+import org.eclipse.papyrus.infra.nattable.dataprovider.RowIndexHeaderDataProvider;
+import org.eclipse.papyrus.infra.nattable.dataprovider.RowLabelHeaderDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;
+import org.eclipse.swt.SWT;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         Layer stack used for row header
+ */
+public class RowHeaderLayerStack extends AbstractLayerTransform {
+
+	/**
+	 * Default columns width
+	 */
+	public static final int DEFAULT_COLUMN_WIDTH = 150;
+
+	/**
+	 * default rows height
+	 */
+	public static final int DEFAULT_ROW_HEIGHT = DefaultSizeUtils.getDefaultCellWidth();
+
+	/**
+	 * the table manager
+	 */
+	protected final INattableModelManager tableManager;
+	/**
+	 * the composite layer
+	 */
+	protected final CompositeLayer compositeLayer;
+
+	/**
+	 * the index data layer
+	 */
+	protected final DataLayer indexDataLayer;
+
+	/**
+	 * the label data layer
+	 */
+	protected final DataLayer labelDataLayer;
+
+	/**
+	 * the row header layer index
+	 */
+	private final AbstractLayer indexRowHeaderLayer;
+
+	/**
+	 * the row header layer label
+	 */
+	protected final AbstractLayer labelRowHeaderLayer;
+	/**
+	 * the label data provider
+	 */
+	protected final IDataProvider indexDataProvider;
+
+	/**
+	 * the index data provider
+	 */
+	protected final IDataProvider labelDataProvider;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param bodyLayer
+	 * @deprecated use the other constructor
+	 */
+	@Deprecated
+	public RowHeaderLayerStack(final IDataProvider dataProvider, final BodyLayerStack bodyLayer) {
+		final DataLayer dataLayer = new DataLayer(dataProvider, RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);
+		// I know that selection layer is probably false
+		final RowHeaderLayer rowHeaderLayer = new RowHeaderLayer(dataLayer, bodyLayer, /* bodyLayer.getSelectionLayer() */new SelectionLayer(dataLayer), false);
+		rowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());
+		// Did not work ! Needed : Have the same type of cell in row and column headers
+		rowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());
+		// final IConfiguration configuration = new CustomConfig();
+		// setUnderlyingLayer(sortHeaderLayer);
+		// rowHeaderLayer.addConfiguration(configuration);
+		// rowHeaderLayer.addConfiguration(new RowOnlySelectionBindings());
+		setUnderlyingLayer(rowHeaderLayer);
+		setRegionName(GridRegion.ROW_HEADER);
+		this.labelRowHeaderLayer = null;
+		this.indexRowHeaderLayer = null;
+		this.tableManager = null;
+		this.labelDataProvider = null;
+		this.indexDataProvider = null;
+		this.indexDataLayer = null;
+		this.labelDataLayer = null;
+		this.compositeLayer = null;
+	}
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param bodyLayerStack
+	 *            the body layer
+	 */
+	public RowHeaderLayerStack(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {
+		this.tableManager = tableManager;
+		// 1. create the data provider
+		this.indexDataProvider = createIndexDataProvider();
+		this.labelDataProvider = createLabelDataProvider();
+
+		// 2. create the data layer
+		this.indexDataLayer = createIndexDataLayer();
+		this.labelDataLayer = createLabelDataLayer();
+
+		// 3. create the row header layer
+		this.indexRowHeaderLayer = createIndexRowHeaderLayer(bodyLayerStack, tableManager);
+		this.labelRowHeaderLayer = createLabelRowHeaderLayer(bodyLayerStack, tableManager);
+
+		// 3.1 configure layer
+		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());
+		this.indexRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);
+		this.labelRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);
+
+		// 4. create the composite layer
+		this.compositeLayer = new CompositeLayer(2, 1);
+		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, indexRowHeaderLayer, 0, 0);
+		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, labelRowHeaderLayer, 1, 0);
+
+		// 3. configure the layer
+		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());
+		this.compositeLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());
+		this.compositeLayer.setRegionName(GridRegion.ROW_HEADER);
+		setUnderlyingLayer(compositeLayer);
+		setRegionName(GridRegion.ROW_HEADER);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label data provider to use
+	 */
+	protected IDataProvider createLabelDataProvider() {
+		return new RowLabelHeaderDataProvider(this.tableManager);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the index data provider to use
+	 */
+	protected IDataProvider createIndexDataProvider() {
+		return new RowIndexHeaderDataProvider(this.tableManager);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label data provider to use
+	 */
+	public IDataProvider getLabelDataProvider() {
+		return this.labelDataProvider;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the index data provider to use
+	 */
+	public IDataProvider getIndexDataProvider() {
+		return this.indexDataProvider;
+	}
+
+	/**
+	 *
+	 * @param bodyLayerStack
+	 * @param tableManager
+	 * @return
+	 */
+	protected AbstractLayer createIndexRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {
+		RowHeaderLayer layer = new RowHeaderLayer(getIndexDataLayer(), bodyLayerStack, bodyLayerStack.getSelectionLayer(), false);
+		return layer;
+	}
+
+	/**
+	 *
+	 * @param bodyLayerStack
+	 * @param tableManager
+	 * @return
+	 */
+	protected AbstractLayer createLabelRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {
+		return new RowHeaderLayer(getLabelDataLayer(), bodyLayerStack.getViewportLayer(), bodyLayerStack.getSelectionLayer(), false);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the index row layer to use
+	 */
+	public final AbstractLayer getIndexRowHeaderLayer() {
+		return this.indexRowHeaderLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label row layer to use
+	 */
+	public final AbstractLayer getLabelRowHeaderLayer() {
+		return this.labelRowHeaderLayer;
+	}
+
+	/**
+	 * @param createLabelDataProvider
+	 * @return
+	 */
+	protected DataLayer createLabelDataLayer() {
+		return new DataLayer(getLabelDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);
+	}
+
+	/**
+	 * @param createLabelDataProvider
+	 * @return
+	 */
+	public final DataLayer getLabelDataLayer() {
+		return this.labelDataLayer;
+	}
+
+
+	/**
+	 * @param createIndexDataProvider
+	 * @return
+	 */
+	protected DataLayer createIndexDataLayer() {
+		return new DataLayer(getIndexDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);
+	}
+
+	/**
+	 * @param createIndexDataProvider
+	 * @return
+	 */
+	public final DataLayer getIndexDataLayer() {
+		return this.indexDataLayer;
+	}
+
+
+	/**
+	 *
+	 * @author Vincent Lorenzo
+	 *         Configuration providing the selection binding
+	 */
+	public static class CustomConfig extends DefaultSelectionBindings {
+
+
+		/**
+		 *
+		 * @see org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings#configureRowHeaderMouseClickBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+		 *
+		 * @param uiBindingRegistry
+		 */
+		@Override
+		protected void configureRowHeaderMouseClickBindings(final UiBindingRegistry uiBindingRegistry) {
+			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new MouseEditAction());
+		}
+	}
+
+
+	// public static class ReoderRowConfid extends AbstractUiBindingConfiguration {// This configuration should be added by the same kind of layer that DefaultColumnReorderLayerConfiguration but for row!
+	//
+	// @Override
+	// public void configureUiBindings(final UiBindingRegistry uiBindingRegistry) {
+	// uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.rowHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CellDragMode(), new RowReorderDragMode()));
+	// }
+	// }
+
+	/**
+	 *
+	 * @return
+	 *         the index data layer
+	 */
+	public DataLayer getRowIndexDataLayer() {
+		return indexDataLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label data layer
+	 */
+	public DataLayer getRowLabelDataLayer() {
+		return labelDataLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the row header layer index
+	 */
+	public AbstractLayer getRowHeaderLayerIndex() {
+		return this.indexRowHeaderLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the row header layer label
+	 */
+	public AbstractLayer getRowHeaderLayerLabel() {
+		return this.labelRowHeaderLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the composite layer
+	 */
+	public CompositeLayer getCompositeLayer() {
+		return this.compositeLayer;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java
index 306153f1576..37c59f77d0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java
@@ -1,318 +1,318 @@
-/*****************************************************************************

- * 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.listener;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-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.util.EcoreUtil;

-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.nebula.widgets.nattable.NatTable;

-import org.eclipse.papyrus.infra.nattable.Activator;

-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.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * This class listen the changes in the table model which require nattable update

- *

- * @author Vincent Lorenzo

- *

- */

-public class HideShowCategoriesTableListener implements ResourceSetListener {

-

-	private INattableModelManager tableManager;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public HideShowCategoriesTableListener(INattableModelManager tableManager) {

-		this.tableManager = tableManager;

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 */

-	protected void manageHideShowCategories(Notification notification) {

-		int eventType = notification.getEventType();

-		Object notifier = notification.getNotifier();

-		List<Integer> toShow = null;

-		List<Integer> toHide = null;

-		if (notifier instanceof Table) {

-			if (eventType == Notification.REMOVE) {

-				Object oldValue = notification.getOldValue();

-				// we are showing categories

-				Assert.isTrue(notification.getNewValue() == null);

-				toShow = ((IntListValueStyle) oldValue).getIntListValue();

-			} else if (eventType == Notification.ADD) {

-				Object newValue = notification.getNewValue();

-				// we are hiding all categories

-				Assert.isTrue(notification.getOldValue() == null);

-				toHide = ((IntListValueStyle) newValue).getIntListValue();

-			}

-		}

-		if (notifier instanceof IntListValueStyle) {// && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue()) {

-			if (Notification.REMOVE == eventType) {

-				Object oldValue = notification.getOldValue();

-				Assert.isTrue(oldValue instanceof Integer);

-				toShow = Collections.singletonList((Integer) oldValue);

-			}

-			if (Notification.ADD == eventType) {

-				Object newValue = notification.getNewValue();

-				Assert.isTrue(newValue instanceof Integer);

-				toHide = Collections.singletonList((Integer) newValue);

-			}

-			if (Notification.ADD_MANY == eventType) {

-				Object newValue = notification.getNewValue();

-				Assert.isTrue(newValue instanceof Collection<?>);

-				toHide = new ArrayList<Integer>();

-				for (Object tmp : (Collection<?>) newValue) {

-					Assert.isTrue(tmp instanceof Integer);

-					toHide.add((Integer) tmp);

-				}

-			}

-			if (Notification.REMOVE_MANY == eventType) {

-				Object oldValue = notification.getOldValue();

-				Assert.isTrue(oldValue instanceof Collection<?>);

-				toShow = new ArrayList<Integer>();

-				for (Object tmp : (Collection<?>) oldValue) {

-					Assert.isTrue(tmp instanceof Integer);

-					toShow.add((Integer) tmp);

-				}

-			}

-		}

-

-		if (toShow != null || toHide != null) {

-			((ITreeNattableModelManager) this.tableManager).hideShowCategories(toHide, toShow);

-		}

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification about changing the appearance of the tree in the table (single to multi/multi to single column in row header)

-	 */

-	protected void manageChangeOnDisplayStyle(Notification notification) {

-		boolean multiToSingle = false;

-		Object notifier = notification.getNotifier();

-		Object feature = notification.getFeature();

-		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {

-			Object newValue = notification.getNewValue();

-			if (newValue == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {

-				multiToSingle = false;

-			} else if (newValue == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {

-				multiToSingle = true;

-			} else {

-				return;

-			}

-		}

-		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {

-			Object tmp = notification.getNewValue();

-			if (!(tmp instanceof TableDisplayStyle)) {

-				return;

-			}

-			TableDisplayStyle newValue = (TableDisplayStyle) tmp;

-			if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {

-				multiToSingle = false;

-			} else if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {

-				multiToSingle = true;

-			} else {

-				return;

-			}

-

-		}

-

-		if (multiToSingle) {

-			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);

-			natTable.refresh();

-			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(null, null);

-		} else {

-			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);

-			natTable.refresh();

-			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(StyleUtils.getHiddenDepths(tableManager), null);

-		}

-

-	}

-

-

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param arg0

-	 */

-	@Override

-	public void resourceSetChanged(ResourceSetChangeEvent arg0) {

-		if (null == this.tableManager || null == this.tableManager.getTable() || null == this.tableManager.getTable().getTableConfiguration()) {

-			// we are deleting the table

-			return;

-		}

-		for (Notification current : arg0.getNotifications()) {

-			if (isNotificationOnHideShowCategories(current)) {

-				manageHideShowCategories(current);

-			}

-			if (isNotificationOnSingleOrMultiColumnInRowHeader(current)) {

-				manageChangeOnDisplayStyle(current);

-			}

-		}

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws RollbackException

-	 */

-	@Override

-	public Command transactionAboutToCommit(ResourceSetChangeEvent arg0) throws RollbackException {

-		// nothing to do

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()

-	 *

-	 * @return

-	 */

-	@Override

-	public NotificationFilter getFilter() {

-		return new NotificationFilter.Custom() {

-

-			@Override

-			public boolean matches(Notification notification) {

-				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {

-					return false;

-				}

-				Object notifier = notification.getNotifier();

-				if (notifier instanceof EObject) {

-					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {

-						// we must verify than the notification concern the current managed table

-						try {

-							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {

-								return false;

-							}

-						} catch (Exception e) {

-							Activator.log.error(e);

-						}

-

-						return isNotificationOnHideShowCategories(notification) || isNotificationOnSingleOrMultiColumnInRowHeader(notification);

-					}

-				}

-

-				return false;

-			}

-		};

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 * @return

-	 * 		<code>true</code> if the notification concerns the display style of the table

-	 */

-	private static final boolean isNotificationOnSingleOrMultiColumnInRowHeader(Notification notification) {

-		Object feature = notification.getFeature();

-		Object notifier = notification.getNotifier();

-		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {

-			return true;

-		}

-		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {

-			Object value = null;

-			if (Notification.ADD == notification.getEventType()) {

-				value = notification.getNewValue();

-			}

-			if (value instanceof TableDisplayStyle) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 * @return

-	 * 		<code>true</code> if the notification concerns the hide/show of the categoriesF

-	 */

-	private static final boolean isNotificationOnHideShowCategories(Notification notification) {

-		Object notifier = notification.getNotifier();

-		Object feature = notification.getFeature();

-		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {

-			Object style = notification.getOldValue();

-			if (style == null) {

-				style = notification.getNewValue();

-			}

-			return style instanceof IntListValueStyle && ((IntListValueStyle) style).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		}

-		return notifier instanceof IntListValueStyle && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue();

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isAggregatePrecommitListener() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPostcommitOnly() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPrecommitOnly() {

-		// nothing to do

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * 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.listener;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+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.util.EcoreUtil;
+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.nebula.widgets.nattable.NatTable;
+import org.eclipse.papyrus.infra.nattable.Activator;
+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.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * This class listen the changes in the table model which require nattable update
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HideShowCategoriesTableListener implements ResourceSetListener {
+
+	private INattableModelManager tableManager;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public HideShowCategoriesTableListener(INattableModelManager tableManager) {
+		this.tableManager = tableManager;
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 */
+	protected void manageHideShowCategories(Notification notification) {
+		int eventType = notification.getEventType();
+		Object notifier = notification.getNotifier();
+		List<Integer> toShow = null;
+		List<Integer> toHide = null;
+		if (notifier instanceof Table) {
+			if (eventType == Notification.REMOVE) {
+				Object oldValue = notification.getOldValue();
+				// we are showing categories
+				Assert.isTrue(notification.getNewValue() == null);
+				toShow = ((IntListValueStyle) oldValue).getIntListValue();
+			} else if (eventType == Notification.ADD) {
+				Object newValue = notification.getNewValue();
+				// we are hiding all categories
+				Assert.isTrue(notification.getOldValue() == null);
+				toHide = ((IntListValueStyle) newValue).getIntListValue();
+			}
+		}
+		if (notifier instanceof IntListValueStyle) {// && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue()) {
+			if (Notification.REMOVE == eventType) {
+				Object oldValue = notification.getOldValue();
+				Assert.isTrue(oldValue instanceof Integer);
+				toShow = Collections.singletonList((Integer) oldValue);
+			}
+			if (Notification.ADD == eventType) {
+				Object newValue = notification.getNewValue();
+				Assert.isTrue(newValue instanceof Integer);
+				toHide = Collections.singletonList((Integer) newValue);
+			}
+			if (Notification.ADD_MANY == eventType) {
+				Object newValue = notification.getNewValue();
+				Assert.isTrue(newValue instanceof Collection<?>);
+				toHide = new ArrayList<Integer>();
+				for (Object tmp : (Collection<?>) newValue) {
+					Assert.isTrue(tmp instanceof Integer);
+					toHide.add((Integer) tmp);
+				}
+			}
+			if (Notification.REMOVE_MANY == eventType) {
+				Object oldValue = notification.getOldValue();
+				Assert.isTrue(oldValue instanceof Collection<?>);
+				toShow = new ArrayList<Integer>();
+				for (Object tmp : (Collection<?>) oldValue) {
+					Assert.isTrue(tmp instanceof Integer);
+					toShow.add((Integer) tmp);
+				}
+			}
+		}
+
+		if (toShow != null || toHide != null) {
+			((ITreeNattableModelManager) this.tableManager).hideShowCategories(toHide, toShow);
+		}
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification about changing the appearance of the tree in the table (single to multi/multi to single column in row header)
+	 */
+	protected void manageChangeOnDisplayStyle(Notification notification) {
+		boolean multiToSingle = false;
+		Object notifier = notification.getNotifier();
+		Object feature = notification.getFeature();
+		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {
+			Object newValue = notification.getNewValue();
+			if (newValue == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {
+				multiToSingle = false;
+			} else if (newValue == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {
+				multiToSingle = true;
+			} else {
+				return;
+			}
+		}
+		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {
+			Object tmp = notification.getNewValue();
+			if (!(tmp instanceof TableDisplayStyle)) {
+				return;
+			}
+			TableDisplayStyle newValue = (TableDisplayStyle) tmp;
+			if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {
+				multiToSingle = false;
+			} else if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {
+				multiToSingle = true;
+			} else {
+				return;
+			}
+
+		}
+
+		if (multiToSingle) {
+			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);
+			natTable.refresh();
+			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(null, null);
+		} else {
+			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);
+			natTable.refresh();
+			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(StyleUtils.getHiddenDepths(tableManager), null);
+		}
+
+	}
+
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param arg0
+	 */
+	@Override
+	public void resourceSetChanged(ResourceSetChangeEvent arg0) {
+		if (null == this.tableManager || null == this.tableManager.getTable() || null == this.tableManager.getTable().getTableConfiguration()) {
+			// we are deleting the table
+			return;
+		}
+		for (Notification current : arg0.getNotifications()) {
+			if (isNotificationOnHideShowCategories(current)) {
+				manageHideShowCategories(current);
+			}
+			if (isNotificationOnSingleOrMultiColumnInRowHeader(current)) {
+				manageChangeOnDisplayStyle(current);
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws RollbackException
+	 */
+	@Override
+	public Command transactionAboutToCommit(ResourceSetChangeEvent arg0) throws RollbackException {
+		// nothing to do
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()
+	 *
+	 * @return
+	 */
+	@Override
+	public NotificationFilter getFilter() {
+		return new NotificationFilter.Custom() {
+
+			@Override
+			public boolean matches(Notification notification) {
+				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {
+					return false;
+				}
+				Object notifier = notification.getNotifier();
+				if (notifier instanceof EObject) {
+					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {
+						// we must verify than the notification concern the current managed table
+						try {
+							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {
+								return false;
+							}
+						} catch (Exception e) {
+							Activator.log.error(e);
+						}
+
+						return isNotificationOnHideShowCategories(notification) || isNotificationOnSingleOrMultiColumnInRowHeader(notification);
+					}
+				}
+
+				return false;
+			}
+		};
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 * @return
+	 * 		<code>true</code> if the notification concerns the display style of the table
+	 */
+	private static final boolean isNotificationOnSingleOrMultiColumnInRowHeader(Notification notification) {
+		Object feature = notification.getFeature();
+		Object notifier = notification.getNotifier();
+		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {
+			return true;
+		}
+		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {
+			Object value = null;
+			if (Notification.ADD == notification.getEventType()) {
+				value = notification.getNewValue();
+			}
+			if (value instanceof TableDisplayStyle) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 * @return
+	 * 		<code>true</code> if the notification concerns the hide/show of the categoriesF
+	 */
+	private static final boolean isNotificationOnHideShowCategories(Notification notification) {
+		Object notifier = notification.getNotifier();
+		Object feature = notification.getFeature();
+		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {
+			Object style = notification.getOldValue();
+			if (style == null) {
+				style = notification.getNewValue();
+			}
+			return style instanceof IntListValueStyle && ((IntListValueStyle) style).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		}
+		return notifier instanceof IntListValueStyle && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue();
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isAggregatePrecommitListener() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPostcommitOnly() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPrecommitOnly() {
+		// nothing to do
+		return false;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
index 36ef614415f..48957db9550 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
@@ -1,301 +1,301 @@
-/*****************************************************************************

- * Copyright (c) 2012, 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 430880

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.listener;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-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.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;

-import org.eclipse.papyrus.infra.nattable.utils.LocationValue;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.DropTargetEvent;

-import org.eclipse.swt.dnd.DropTargetListener;

-import org.eclipse.swt.graphics.Point;

-

-/**

- *

- * This listener allow to manage the drop inside the table

- *

- */

-public class NatTableDropListener implements DropTargetListener {

-

-	/**

-	 * the table manager

-	 */

-	private final INattableModelManager manager;

-

-	private final ISelectionExtractor selectionExtractor;

-	/**

-	 * the location value to use to drop the elements

-	 */

-	private LocationValue dropKindValue;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the table manager

-	 * @param selectionExtractor

-	 */

-	public NatTableDropListener(final INattableModelManager manager, ISelectionExtractor selectionExtractor) {

-		this.manager = manager;

-		this.selectionExtractor = selectionExtractor;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragEnter(final DropTargetEvent event) {

-		validateDropEvent(event);

-	}

-

-	protected void validateDropEvent(final DropTargetEvent event) {

-		event.operations = DND.DROP_COPY | DND.DROP_MOVE;

-

-		// Move and Link semantics don't make sense for tables which, like diagrams, are visualizations

-		// of objects also visualized in other places (such as the Model Explorer)

-		event.detail = DND.DROP_COPY;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragLeave(final DropTargetEvent event) {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragOperationChanged(final DropTargetEvent event) {

-		validateDropEvent(event);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragOver(final DropTargetEvent event) {

-		validateDropEvent(event);

-		this.dropKindValue = null;

-		final List<Object> droppedElements = getDroppedObjects(event);

-		if (droppedElements.isEmpty()) {

-			return; // Nothing to do

-		}

-		this.dropKindValue = this.manager.getLocationInTheTable(new Point(event.x, event.y));

-		int drop = DND.DROP_NONE;

-		switch (this.dropKindValue.getKind()) {

-		case AFTER_COLUMN_HEADER:

-			if (this.manager.canDropColumnsElement(droppedElements)) {

-				drop = event.detail;

-			}

-			break;

-		case AFTER_ROW_HEADER:

-			if (this.manager.canDropRowElement(droppedElements)) {

-				drop = event.detail;

-			}

-			break;

-		case COLUMN_HEADER:

-			if (this.manager.canInsertColumns(droppedElements, this.dropKindValue.getColumnIndex())) {

-				drop = event.detail;

-			}

-			break;

-		case ROW_HEADER:

-			if (this.manager.canInsertRow(droppedElements, this.dropKindValue.getRowIndex())) {

-				drop = event.detail;

-			}

-			break;

-		case CELL:

-			int rowIndex = this.dropKindValue.getRowIndex();

-			int columnIndex = this.dropKindValue.getColumnIndex();

-			final Object rowElement = this.manager.getRowElement(rowIndex);

-			final Object columnElement = this.manager.getColumnElement(columnIndex);

-			if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {

-				final TransactionalEditingDomain domain = getEditingDomain();

-				final Command cmd = getDropSetValueCommand(domain, droppedElements);

-				if (cmd!=null && cmd.canExecute()) {

-					drop = event.detail;

-				}

-			}

-			break;

-		case UNKNOWN:

-			drop = DND.DROP_NONE;

-			break;

-		default:

-			drop = DND.DROP_NONE;

-			break;

-		}

-		event.detail = drop;

-	}

-

-	protected List<Object> getDroppedObjects(DropTargetEvent event) {

-		final LocalTransfer localTransfer = LocalTransfer.getInstance();

-		final Object data = localTransfer.nativeToJava(event.currentDataType);

-		IStructuredSelection structuredSelection = null;

-		if (data instanceof IStructuredSelection) {

-			structuredSelection = (IStructuredSelection) data;

-		} else if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType)) {

-			// Try the local selection transfer

-			ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();

-			if (selection instanceof IStructuredSelection) {

-				structuredSelection = (IStructuredSelection) selection;

-			}

-		}

-		if (structuredSelection == null) {

-			return Collections.emptyList();

-		}

-		return new ArrayList<Object>(extractSelectedObjects(structuredSelection));

-	}

-

-	protected Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {

-		return this.selectionExtractor.extractSelectedObjects(structuredSelection);

-	}

-

-	/**

-	 *

-	 * @param droppedElements

-	 *            the dropped elements

-	 * @return

-	 *         the command to set the value in the selected cell

-	 */

-	private Command getDropSetValueCommand(final TransactionalEditingDomain domain, final List<Object> droppedElements) {

-		int rowIndex = this.dropKindValue.getRowIndex();

-		int columnIndex = this.dropKindValue.getColumnIndex();

-		final Object rowElement = this.manager.getRowElement(rowIndex);

-		final Object columnElement = this.manager.getColumnElement(columnIndex);

-		if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {

-			Object newValue = null;

-			final Object currentValue = CellManagerFactory.INSTANCE.getCrossValueIgnoringProblems(columnElement, rowElement, this.manager);

-			if (currentValue instanceof Collection<?>) {

-				// the dropped elements will be added to the current Value in case of multivalued cell

-				final Collection<Object> tmpNewValue = new ArrayList<Object>();

-				tmpNewValue.addAll((Collection<?>) currentValue);

-				tmpNewValue.addAll(droppedElements);

-				newValue = tmpNewValue;

-			} else if (droppedElements.size() == 1) {

-				newValue = droppedElements.get(0);

-			} else {

-				newValue = droppedElements;

-			}

-			final Command cmd = CellManagerFactory.INSTANCE.getSetCellValueCommand(domain, columnElement, rowElement, newValue, manager);

-			return cmd;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void drop(final DropTargetEvent event) {

-		// we drop the elements into the table

-		final List<Object> droppedElements = getDroppedObjects(event);

-		if (!droppedElements.isEmpty()) {

-			if (this.dropKindValue != null) {

-				switch (this.dropKindValue.getKind()) {

-				case AFTER_COLUMN_HEADER:

-					this.manager.addColumns(droppedElements);

-					break;

-				case AFTER_ROW_HEADER:

-					this.manager.addRows(droppedElements);

-					break;

-				case COLUMN_HEADER:

-					this.manager.insertColumns(droppedElements, this.dropKindValue.getColumnIndex());

-					break;

-				case ROW_HEADER:

-					this.manager.insertRows(droppedElements, this.dropKindValue.getRowIndex());

-					break;

-				case CELL:

-					final TransactionalEditingDomain domain = getEditingDomain();

-					final Command cmd = getDropSetValueCommand(domain, droppedElements);

-					if (cmd!=null && cmd.canExecute()) {

-						domain.getCommandStack().execute(cmd);

-					}

-					break;

-				case UNKNOWN:

-					break;

-				default:

-					break;

-				}

-			}

-		}

-		this.dropKindValue = null;

-	}

-

-

-	@Override

-	public void dropAccept(final DropTargetEvent event) {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the Transactional Editing Domain to use to edit the model

-	 */

-	private TransactionalEditingDomain getEditingDomain() {

-		TransactionalEditingDomain domain = null;

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(this.manager.getTable().getContext());

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-

-		if (registry != null) {

-			try {

-				domain = registry.getService(TransactionalEditingDomain.class);

-			} catch (ServiceException e) {

-				Activator.log.error(e);

-			}

-		}

-		return domain;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 430880
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.listener;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+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.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;
+import org.eclipse.papyrus.infra.nattable.utils.LocationValue;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.DropTargetListener;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ *
+ * This listener allow to manage the drop inside the table
+ *
+ */
+public class NatTableDropListener implements DropTargetListener {
+
+	/**
+	 * the table manager
+	 */
+	private final INattableModelManager manager;
+
+	private final ISelectionExtractor selectionExtractor;
+	/**
+	 * the location value to use to drop the elements
+	 */
+	private LocationValue dropKindValue;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the table manager
+	 * @param selectionExtractor
+	 */
+	public NatTableDropListener(final INattableModelManager manager, ISelectionExtractor selectionExtractor) {
+		this.manager = manager;
+		this.selectionExtractor = selectionExtractor;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragEnter(final DropTargetEvent event) {
+		validateDropEvent(event);
+	}
+
+	protected void validateDropEvent(final DropTargetEvent event) {
+		event.operations = DND.DROP_COPY | DND.DROP_MOVE;
+
+		// Move and Link semantics don't make sense for tables which, like diagrams, are visualizations
+		// of objects also visualized in other places (such as the Model Explorer)
+		event.detail = DND.DROP_COPY;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragLeave(final DropTargetEvent event) {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragOperationChanged(final DropTargetEvent event) {
+		validateDropEvent(event);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragOver(final DropTargetEvent event) {
+		validateDropEvent(event);
+		this.dropKindValue = null;
+		final List<Object> droppedElements = getDroppedObjects(event);
+		if (droppedElements.isEmpty()) {
+			return; // Nothing to do
+		}
+		this.dropKindValue = this.manager.getLocationInTheTable(new Point(event.x, event.y));
+		int drop = DND.DROP_NONE;
+		switch (this.dropKindValue.getKind()) {
+		case AFTER_COLUMN_HEADER:
+			if (this.manager.canDropColumnsElement(droppedElements)) {
+				drop = event.detail;
+			}
+			break;
+		case AFTER_ROW_HEADER:
+			if (this.manager.canDropRowElement(droppedElements)) {
+				drop = event.detail;
+			}
+			break;
+		case COLUMN_HEADER:
+			if (this.manager.canInsertColumns(droppedElements, this.dropKindValue.getColumnIndex())) {
+				drop = event.detail;
+			}
+			break;
+		case ROW_HEADER:
+			if (this.manager.canInsertRow(droppedElements, this.dropKindValue.getRowIndex())) {
+				drop = event.detail;
+			}
+			break;
+		case CELL:
+			int rowIndex = this.dropKindValue.getRowIndex();
+			int columnIndex = this.dropKindValue.getColumnIndex();
+			final Object rowElement = this.manager.getRowElement(rowIndex);
+			final Object columnElement = this.manager.getColumnElement(columnIndex);
+			if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {
+				final TransactionalEditingDomain domain = getEditingDomain();
+				final Command cmd = getDropSetValueCommand(domain, droppedElements);
+				if (cmd!=null && cmd.canExecute()) {
+					drop = event.detail;
+				}
+			}
+			break;
+		case UNKNOWN:
+			drop = DND.DROP_NONE;
+			break;
+		default:
+			drop = DND.DROP_NONE;
+			break;
+		}
+		event.detail = drop;
+	}
+
+	protected List<Object> getDroppedObjects(DropTargetEvent event) {
+		final LocalTransfer localTransfer = LocalTransfer.getInstance();
+		final Object data = localTransfer.nativeToJava(event.currentDataType);
+		IStructuredSelection structuredSelection = null;
+		if (data instanceof IStructuredSelection) {
+			structuredSelection = (IStructuredSelection) data;
+		} else if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType)) {
+			// Try the local selection transfer
+			ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
+			if (selection instanceof IStructuredSelection) {
+				structuredSelection = (IStructuredSelection) selection;
+			}
+		}
+		if (structuredSelection == null) {
+			return Collections.emptyList();
+		}
+		return new ArrayList<Object>(extractSelectedObjects(structuredSelection));
+	}
+
+	protected Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {
+		return this.selectionExtractor.extractSelectedObjects(structuredSelection);
+	}
+
+	/**
+	 *
+	 * @param droppedElements
+	 *            the dropped elements
+	 * @return
+	 *         the command to set the value in the selected cell
+	 */
+	private Command getDropSetValueCommand(final TransactionalEditingDomain domain, final List<Object> droppedElements) {
+		int rowIndex = this.dropKindValue.getRowIndex();
+		int columnIndex = this.dropKindValue.getColumnIndex();
+		final Object rowElement = this.manager.getRowElement(rowIndex);
+		final Object columnElement = this.manager.getColumnElement(columnIndex);
+		if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {
+			Object newValue = null;
+			final Object currentValue = CellManagerFactory.INSTANCE.getCrossValueIgnoringProblems(columnElement, rowElement, this.manager);
+			if (currentValue instanceof Collection<?>) {
+				// the dropped elements will be added to the current Value in case of multivalued cell
+				final Collection<Object> tmpNewValue = new ArrayList<Object>();
+				tmpNewValue.addAll((Collection<?>) currentValue);
+				tmpNewValue.addAll(droppedElements);
+				newValue = tmpNewValue;
+			} else if (droppedElements.size() == 1) {
+				newValue = droppedElements.get(0);
+			} else {
+				newValue = droppedElements;
+			}
+			final Command cmd = CellManagerFactory.INSTANCE.getSetCellValueCommand(domain, columnElement, rowElement, newValue, manager);
+			return cmd;
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void drop(final DropTargetEvent event) {
+		// we drop the elements into the table
+		final List<Object> droppedElements = getDroppedObjects(event);
+		if (!droppedElements.isEmpty()) {
+			if (this.dropKindValue != null) {
+				switch (this.dropKindValue.getKind()) {
+				case AFTER_COLUMN_HEADER:
+					this.manager.addColumns(droppedElements);
+					break;
+				case AFTER_ROW_HEADER:
+					this.manager.addRows(droppedElements);
+					break;
+				case COLUMN_HEADER:
+					this.manager.insertColumns(droppedElements, this.dropKindValue.getColumnIndex());
+					break;
+				case ROW_HEADER:
+					this.manager.insertRows(droppedElements, this.dropKindValue.getRowIndex());
+					break;
+				case CELL:
+					final TransactionalEditingDomain domain = getEditingDomain();
+					final Command cmd = getDropSetValueCommand(domain, droppedElements);
+					if (cmd!=null && cmd.canExecute()) {
+						domain.getCommandStack().execute(cmd);
+					}
+					break;
+				case UNKNOWN:
+					break;
+				default:
+					break;
+				}
+			}
+		}
+		this.dropKindValue = null;
+	}
+
+
+	@Override
+	public void dropAccept(final DropTargetEvent event) {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the Transactional Editing Domain to use to edit the model
+	 */
+	private TransactionalEditingDomain getEditingDomain() {
+		TransactionalEditingDomain domain = null;
+		ServicesRegistry registry = null;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(this.manager.getTable().getContext());
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+
+		if (registry != null) {
+			try {
+				domain = registry.getService(TransactionalEditingDomain.class);
+			} catch (ServiceException e) {
+				Activator.log.error(e);
+			}
+		}
+		return domain;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java
index 720cf11976c..fafd6600a4e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java
@@ -1,305 +1,305 @@
-/*****************************************************************************

- * 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

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug #471903

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.listener;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-

-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.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-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.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-

-/**

- * @author Vincent Lorenzo

- *

- *         This listener is used to notify {@link CompositeAxisManagerForEventList} when an event comes

- *

- */

-public class UpdateTableContentListener implements ResourceSetListener {

-

-	/**

-	 * the current table for which we want notify its axis manager

-	 */

-	protected NattableModelManager tableManager;

-

-	/**

-	 * the axis manager to notify

-	 */

-	protected IAxisManagerForEventList axisManager;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public UpdateTableContentListener(final NattableModelManager tableManager, final IAxisManagerForEventList axisManager) {

-		this.tableManager = tableManager;

-		this.axisManager = axisManager;

-	}

-

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()

-	 *

-	 * @return

-	 */

-	@Override

-	public NotificationFilter getFilter() {

-		return new NotificationFilter.Custom() {

-

-			@Override

-			public boolean matches(Notification notification) {

-				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {

-					return false;

-				}

-				Object notifier = notification.getNotifier();

-				if (notifier instanceof EObject) {

-					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {

-						// we must verify than the notification concern the current managed table

-						try {

-							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {

-								return false;

-							}

-						} catch (Exception e) {

-							Activator.log.error(e);

-						}

-					}

-				}

-

-				return true;

-			}

-		};

-	}

-

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws RollbackException

-	 */

-	@Override

-	public final Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {

-		// nothing to do

-		return null;

-	}

-

-

-	/**

-	 * @return <code>true</code> if there are changes on TreeFillingConfiguration

-	 */

-	protected boolean containsTreeFillingConfigurationChange(ResourceSetChangeEvent event) {

-		List<Notification> notifications = event.getNotifications();

-		for (Notification current : notifications) {

-			Object feature = current.getFeature();

-			if (feature == NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void resourceSetChanged(final ResourceSetChangeEvent event) {

-		if (containsTreeFillingConfigurationChange(event)) {

-			this.axisManager.fillingConfigurationsHaveChanged();

-			return;

-		}

-		// The initial notifications

-		final List<Notification> initialNotifications = event.getNotifications();

-		// Create a copy of notifications to keep only the managed one

-		final List<Notification> managedNotifications = new ArrayList<Notification>(initialNotifications);

-		final Iterator<Notification> notificationsIterator = initialNotifications.iterator();

-		int index = 0;

-

-		// Loop on initial notifications

-		while (notificationsIterator.hasNext()) {

-			Notification current = notificationsIterator.next();

-

-			if (managedNotifications.contains(current)) {

-				int currentEvent = current.getEventType();

-				

-				// filtering notification concerning creation of ITreeItemAxis created as children

-				if (Notification.ADD == currentEvent) {

-					current = getAddNotification(current, managedNotifications, index);

-					// check if the remove event is a move action

-				}else if (Notification.REMOVE_MANY == currentEvent || Notification.REMOVE == currentEvent && notificationsIterator.hasNext()) {

-					current = getMoveNotification(current, managedNotifications, index);

-				}

-

-				if (null != this.axisManager && null != current) {

-					this.axisManager.manageEvent(current);

-				}

-			}

-

-			index++;

-		}

-		tableManager.refreshNatTable();

-

-	}

-	

-	/**

-	 * This allow to get the notification from the initial add notification.

-	 * 

-	 * @param initialNotification

-	 *            The initial add notification.

-	 * @param managedNotifications

-	 *            The already managed notifications.

-	 * @param index

-	 *            The index of the notification in the list of initial notifications.

-	 * @return The notification to manage.

-	 */

-	protected Notification getAddNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index){

-		Notification currentNotification = initialNotification;

-		

-		if (NattableaxisPackage.eINSTANCE.getITreeItemAxis_Children() == currentNotification.getFeature()) {

-			if (currentNotification.getNotifier() instanceof ITreeItemAxis && (null == ((EObject) currentNotification.getNotifier()).eContainer() || (((EObject) currentNotification.getNotifier()).eContainer()) instanceof AbstractAxisProvider)) {

-				currentNotification = null;

-			}

-		}

-		

-		return currentNotification;	

-	}

-

-	/**

-	 * This allow to get the move notification from the initial remove notification. This one will be managed as a move (because the move does not exist in GMD command (replaced by add and remove)).

-	 * 

-	 * @param initialNotification

-	 *            The initial remove notification.

-	 * @param managedNotifications

-	 *            The already managed notifications.

-	 * @param index

-	 *            The index of the notification in the list of initial notifications.

-	 * @return The notification to manage.

-	 */

-	@SuppressWarnings("unchecked")

-	protected Notification getMoveNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index) {

-		Notification currentNotification = initialNotification;

-

-		// Create a list of remaining notifications to check if a

-		final List<Notification> remainingNotifications = managedNotifications.subList(index + 1, managedNotifications.size());

-		Iterator<Notification> remainingIterator = remainingNotifications.iterator();

-

-		// we need to verify that a remove_many is not followed by an add_many. in this case it is probably a move inside a list

-		boolean isAMove = false;

-

-		while (!isAMove && remainingIterator.hasNext()) {

-			Notification nextNotification = remainingIterator.next();

-			int nextEventType = nextNotification.getEventType();

-			// Check that the next notification manage a move action with the current one

-			if (Notification.ADD_MANY == nextEventType && currentNotification.getNotifier().equals(nextNotification.getNotifier()) && currentNotification.getFeature().equals(nextNotification.getFeature())) {

-				// Get the old value(s)

-				Collection<Object> oldValue = null;

-				if (Notification.REMOVE == currentNotification.getEventType()) {

-					oldValue = new ArrayList<Object>(1);

-					oldValue.add((Object) currentNotification.getOldValue());

-				} else {

-					oldValue = (Collection<Object>) currentNotification.getOldValue();

-				}

-				// Get the new values

-				Collection<?> newValue = (Collection<?>) nextNotification.getNewValue();

-

-				// Check that all the new values contains the old one (else it's not a move, don't continue

-				isAMove = newValue.containsAll(oldValue);

-				if (isAMove) {

-					if (oldValue.size() == newValue.size()) {

-						// The old and new values are just reorganized, the notification no need to be executed (only refresh on the nattable is necessary)

-						currentNotification = null;

-					} else {

-						// The move is done from a parent to another one, recreate a added notification with only the new added objects at the good position

-						int position = 0;

-

-						// Get the position to add it

-						Iterator<?> newValueIterator = newValue.iterator();

-						while (newValueIterator.hasNext() && oldValue.contains(newValueIterator.next())) {

-							position++;

-						}

-

-						// Get the objects to add

-						final List<Object> addedObject = new ArrayList<Object>(newValue);

-						addedObject.removeAll(oldValue);

-

-						// Create the add notifications

-						currentNotification = new ENotificationImpl((InternalEObject) currentNotification.getNotifier(), Notification.ADD_MANY, (EStructuralFeature) currentNotification.getFeature(), null, addedObject, position);

-					}

-

-					// The move manage the delete and the add notification so skip the next one

-					managedNotifications.remove(nextNotification);

-				}

-			}

-		}

-

-		return currentNotification;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()

-	 *

-	 * @return

-	 */

-	@Override

-	public final boolean isAggregatePrecommitListener() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public final boolean isPrecommitOnly() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public final boolean isPostcommitOnly() {

-		// nothing to do

-		return false;

-	}

-}

+/*****************************************************************************
+ * 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
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug #471903
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.listener;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+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.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+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.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+
+/**
+ * @author Vincent Lorenzo
+ *
+ *         This listener is used to notify {@link CompositeAxisManagerForEventList} when an event comes
+ *
+ */
+public class UpdateTableContentListener implements ResourceSetListener {
+
+	/**
+	 * the current table for which we want notify its axis manager
+	 */
+	protected NattableModelManager tableManager;
+
+	/**
+	 * the axis manager to notify
+	 */
+	protected IAxisManagerForEventList axisManager;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public UpdateTableContentListener(final NattableModelManager tableManager, final IAxisManagerForEventList axisManager) {
+		this.tableManager = tableManager;
+		this.axisManager = axisManager;
+	}
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()
+	 *
+	 * @return
+	 */
+	@Override
+	public NotificationFilter getFilter() {
+		return new NotificationFilter.Custom() {
+
+			@Override
+			public boolean matches(Notification notification) {
+				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {
+					return false;
+				}
+				Object notifier = notification.getNotifier();
+				if (notifier instanceof EObject) {
+					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {
+						// we must verify than the notification concern the current managed table
+						try {
+							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {
+								return false;
+							}
+						} catch (Exception e) {
+							Activator.log.error(e);
+						}
+					}
+				}
+
+				return true;
+			}
+		};
+	}
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws RollbackException
+	 */
+	@Override
+	public final Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
+		// nothing to do
+		return null;
+	}
+
+
+	/**
+	 * @return <code>true</code> if there are changes on TreeFillingConfiguration
+	 */
+	protected boolean containsTreeFillingConfigurationChange(ResourceSetChangeEvent event) {
+		List<Notification> notifications = event.getNotifications();
+		for (Notification current : notifications) {
+			Object feature = current.getFeature();
+			if (feature == NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void resourceSetChanged(final ResourceSetChangeEvent event) {
+		if (containsTreeFillingConfigurationChange(event)) {
+			this.axisManager.fillingConfigurationsHaveChanged();
+			return;
+		}
+		// The initial notifications
+		final List<Notification> initialNotifications = event.getNotifications();
+		// Create a copy of notifications to keep only the managed one
+		final List<Notification> managedNotifications = new ArrayList<Notification>(initialNotifications);
+		final Iterator<Notification> notificationsIterator = initialNotifications.iterator();
+		int index = 0;
+
+		// Loop on initial notifications
+		while (notificationsIterator.hasNext()) {
+			Notification current = notificationsIterator.next();
+
+			if (managedNotifications.contains(current)) {
+				int currentEvent = current.getEventType();
+				
+				// filtering notification concerning creation of ITreeItemAxis created as children
+				if (Notification.ADD == currentEvent) {
+					current = getAddNotification(current, managedNotifications, index);
+					// check if the remove event is a move action
+				}else if (Notification.REMOVE_MANY == currentEvent || Notification.REMOVE == currentEvent && notificationsIterator.hasNext()) {
+					current = getMoveNotification(current, managedNotifications, index);
+				}
+
+				if (null != this.axisManager && null != current) {
+					this.axisManager.manageEvent(current);
+				}
+			}
+
+			index++;
+		}
+		tableManager.refreshNatTable();
+
+	}
+	
+	/**
+	 * This allow to get the notification from the initial add notification.
+	 * 
+	 * @param initialNotification
+	 *            The initial add notification.
+	 * @param managedNotifications
+	 *            The already managed notifications.
+	 * @param index
+	 *            The index of the notification in the list of initial notifications.
+	 * @return The notification to manage.
+	 */
+	protected Notification getAddNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index){
+		Notification currentNotification = initialNotification;
+		
+		if (NattableaxisPackage.eINSTANCE.getITreeItemAxis_Children() == currentNotification.getFeature()) {
+			if (currentNotification.getNotifier() instanceof ITreeItemAxis && (null == ((EObject) currentNotification.getNotifier()).eContainer() || (((EObject) currentNotification.getNotifier()).eContainer()) instanceof AbstractAxisProvider)) {
+				currentNotification = null;
+			}
+		}
+		
+		return currentNotification;	
+	}
+
+	/**
+	 * This allow to get the move notification from the initial remove notification. This one will be managed as a move (because the move does not exist in GMD command (replaced by add and remove)).
+	 * 
+	 * @param initialNotification
+	 *            The initial remove notification.
+	 * @param managedNotifications
+	 *            The already managed notifications.
+	 * @param index
+	 *            The index of the notification in the list of initial notifications.
+	 * @return The notification to manage.
+	 */
+	@SuppressWarnings("unchecked")
+	protected Notification getMoveNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index) {
+		Notification currentNotification = initialNotification;
+
+		// Create a list of remaining notifications to check if a
+		final List<Notification> remainingNotifications = managedNotifications.subList(index + 1, managedNotifications.size());
+		Iterator<Notification> remainingIterator = remainingNotifications.iterator();
+
+		// we need to verify that a remove_many is not followed by an add_many. in this case it is probably a move inside a list
+		boolean isAMove = false;
+
+		while (!isAMove && remainingIterator.hasNext()) {
+			Notification nextNotification = remainingIterator.next();
+			int nextEventType = nextNotification.getEventType();
+			// Check that the next notification manage a move action with the current one
+			if (Notification.ADD_MANY == nextEventType && currentNotification.getNotifier().equals(nextNotification.getNotifier()) && currentNotification.getFeature().equals(nextNotification.getFeature())) {
+				// Get the old value(s)
+				Collection<Object> oldValue = null;
+				if (Notification.REMOVE == currentNotification.getEventType()) {
+					oldValue = new ArrayList<Object>(1);
+					oldValue.add((Object) currentNotification.getOldValue());
+				} else {
+					oldValue = (Collection<Object>) currentNotification.getOldValue();
+				}
+				// Get the new values
+				Collection<?> newValue = (Collection<?>) nextNotification.getNewValue();
+
+				// Check that all the new values contains the old one (else it's not a move, don't continue
+				isAMove = newValue.containsAll(oldValue);
+				if (isAMove) {
+					if (oldValue.size() == newValue.size()) {
+						// The old and new values are just reorganized, the notification no need to be executed (only refresh on the nattable is necessary)
+						currentNotification = null;
+					} else {
+						// The move is done from a parent to another one, recreate a added notification with only the new added objects at the good position
+						int position = 0;
+
+						// Get the position to add it
+						Iterator<?> newValueIterator = newValue.iterator();
+						while (newValueIterator.hasNext() && oldValue.contains(newValueIterator.next())) {
+							position++;
+						}
+
+						// Get the objects to add
+						final List<Object> addedObject = new ArrayList<Object>(newValue);
+						addedObject.removeAll(oldValue);
+
+						// Create the add notifications
+						currentNotification = new ENotificationImpl((InternalEObject) currentNotification.getNotifier(), Notification.ADD_MANY, (EStructuralFeature) currentNotification.getFeature(), null, addedObject, position);
+					}
+
+					// The move manage the delete and the add notification so skip the next one
+					managedNotifications.remove(nextNotification);
+				}
+			}
+		}
+
+		return currentNotification;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()
+	 *
+	 * @return
+	 */
+	@Override
+	public final boolean isAggregatePrecommitListener() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public final boolean isPrecommitOnly() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public final boolean isPostcommitOnly() {
+		// nothing to do
+		return false;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java
index 2e0b18cc69f..0c442b0901f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java
@@ -1,233 +1,233 @@
-/*****************************************************************************

- * 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.List;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractAxisManagerForEventList extends AbstractAxisManager implements IAxisManagerForEventList {

-

-	/**

-	 * the event list used for the managed axis

-	 */

-	protected EventList<Object> eventList;

-

-	/** the message displayed by an exception when we call an inherited method from IAxisManager, forbidden for IAxisManagerForEventList */

-	protected static final String EXCEPTION_MESSAGE = "This method cant be call for IAxisManagerForEventList";////$NON-NLS-1$

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#setEventList(ca.odell.glazedlists.EventList)

-	 *

-	 * @param list

-	 */

-	@Override

-	public final void setEventList(EventList<Object> list) {

-		this.eventList = list;

-	}

-

-

-	/**

-	 * @param notification

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#manageEvent(Notification)

-	 */

-	@Override

-	public void manageEvent(Notification notification) {

-		if (ignoreEvent(notification)) {

-			return;

-		}

-		final int eventType = notification.getEventType();

-		switch (eventType) {

-		case Notification.SET:

-			manageSetNotification(notification);

-			break;

-		case Notification.UNSET:

-			manageUnsetNotification(notification);

-			break;

-		case Notification.ADD:

-			manageAddNotification(notification);

-			break;

-		case Notification.ADD_MANY:

-			manageAddManyNotification(notification);

-			break;

-		case Notification.MOVE:

-			manageMoveNotification(notification);

-			break;

-		case Notification.REMOVE:

-			manageRemoveNotification(notification);

-			break;

-		case Notification.REMOVE_MANY:

-			manageRemoveManyNotification(notification);

-			break;

-		default:

-			return;

-		}

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 * @return

-	 *         <code>true</code> if the notification must be ignored

-	 */

-	protected boolean ignoreEvent(final Notification notification) {

-		if (notification.isTouch()) {

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageRemoveManyNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageRemoveNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageMoveNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageAddManyNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageAddNotification(Notification notification);

-

-	/**

-	 *

-	 * @param notification

-	 */

-	protected abstract void manageSetNotification(Notification notification);

-

-	/**

-	 *

-	 * @param notification

-	 */

-	protected abstract void manageUnsetNotification(Notification notification);

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createManagedObjectList()

-	 *

-	 * @return

-	 */

-	@Override

-	protected final List<Object> createManagedObjectList() {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#addListeners()

-	 *

-	 */

-	@Override

-	protected void addListeners() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#axisManagerHasChanged(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 */

-	@Override

-	protected final void axisManagerHasChanged(Notification notification) {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#initializeManagedObjectList()

-	 *

-	 */

-	@Override

-	protected void initializeManagedObjectList() {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		this.eventList = null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAlreadyManaged(Object object) {

-		return this.eventList.contains(object);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public final List<Object> getAllManagedAxis() {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElements(java.util.List)

-	 *

-	 * @param axisPositions

-	 * @return

-	 */

-	@Override

-	protected final List<Object> getElements(List<Integer> axisPositions) {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-}

+/*****************************************************************************
+ * 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.List;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractAxisManagerForEventList extends AbstractAxisManager implements IAxisManagerForEventList {
+
+	/**
+	 * the event list used for the managed axis
+	 */
+	protected EventList<Object> eventList;
+
+	/** the message displayed by an exception when we call an inherited method from IAxisManager, forbidden for IAxisManagerForEventList */
+	protected static final String EXCEPTION_MESSAGE = "This method cant be call for IAxisManagerForEventList";////$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#setEventList(ca.odell.glazedlists.EventList)
+	 *
+	 * @param list
+	 */
+	@Override
+	public final void setEventList(EventList<Object> list) {
+		this.eventList = list;
+	}
+
+
+	/**
+	 * @param notification
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#manageEvent(Notification)
+	 */
+	@Override
+	public void manageEvent(Notification notification) {
+		if (ignoreEvent(notification)) {
+			return;
+		}
+		final int eventType = notification.getEventType();
+		switch (eventType) {
+		case Notification.SET:
+			manageSetNotification(notification);
+			break;
+		case Notification.UNSET:
+			manageUnsetNotification(notification);
+			break;
+		case Notification.ADD:
+			manageAddNotification(notification);
+			break;
+		case Notification.ADD_MANY:
+			manageAddManyNotification(notification);
+			break;
+		case Notification.MOVE:
+			manageMoveNotification(notification);
+			break;
+		case Notification.REMOVE:
+			manageRemoveNotification(notification);
+			break;
+		case Notification.REMOVE_MANY:
+			manageRemoveManyNotification(notification);
+			break;
+		default:
+			return;
+		}
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 * @return
+	 *         <code>true</code> if the notification must be ignored
+	 */
+	protected boolean ignoreEvent(final Notification notification) {
+		if (notification.isTouch()) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageRemoveManyNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageRemoveNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageMoveNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageAddManyNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageAddNotification(Notification notification);
+
+	/**
+	 *
+	 * @param notification
+	 */
+	protected abstract void manageSetNotification(Notification notification);
+
+	/**
+	 *
+	 * @param notification
+	 */
+	protected abstract void manageUnsetNotification(Notification notification);
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createManagedObjectList()
+	 *
+	 * @return
+	 */
+	@Override
+	protected final List<Object> createManagedObjectList() {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#addListeners()
+	 *
+	 */
+	@Override
+	protected void addListeners() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#axisManagerHasChanged(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected final void axisManagerHasChanged(Notification notification) {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#initializeManagedObjectList()
+	 *
+	 */
+	@Override
+	protected void initializeManagedObjectList() {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		this.eventList = null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAlreadyManaged(Object object) {
+		return this.eventList.contains(object);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public final List<Object> getAllManagedAxis() {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElements(java.util.List)
+	 *
+	 * @param axisPositions
+	 * @return
+	 */
+	@Override
+	protected final List<Object> getElements(List<Integer> axisPositions) {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java
index 4b337f003e3..d2cf537cff7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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 org.eclipse.emf.common.notify.Notification;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public interface IAxisManagerForEventList extends IAxisManager {

-

-	/**

-	 *

-	 * @param notification

-	 */

-	public void manageEvent(final Notification notification);

-

-	/**

-	 *

-	 * @param list

-	 *            the event list owning axis element

-	 */

-	public void setEventList(final EventList<Object> list);

-

-	/**

-	 * This method allows to notify the axis manager than the filling configuration has changed

-	 */

-	public void fillingConfigurationsHaveChanged();

-}

+/*****************************************************************************
+ * 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 org.eclipse.emf.common.notify.Notification;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IAxisManagerForEventList extends IAxisManager {
+
+	/**
+	 *
+	 * @param notification
+	 */
+	public void manageEvent(final Notification notification);
+
+	/**
+	 *
+	 * @param list
+	 *            the event list owning axis element
+	 */
+	public void setEventList(final EventList<Object> list);
+
+	/**
+	 * This method allows to notify the axis manager than the filling configuration has changed
+	 */
+	public void fillingConfigurationsHaveChanged();
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java
index f5c07c0d3e2..2e496e6cb75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * 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.List;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public interface ICompositeAxisManagerForEventList extends ICompositeAxisManager, IAxisManagerForEventList {

-

-	/**

-	 *

-	 * @param subAxisManager

-	 *            the managed axis manager

-	 */

-	public void setSubAxisManagers(final List<IAxisManagerForEventList> subAxisManager);

-

-}

+/*****************************************************************************
+ * 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.List;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ICompositeAxisManagerForEventList extends ICompositeAxisManager, IAxisManagerForEventList {
+
+	/**
+	 *
+	 * @param subAxisManager
+	 *            the managed axis manager
+	 */
+	public void setSubAxisManagers(final List<IAxisManagerForEventList> subAxisManager);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java
index c15523b7a64..ec39d032c0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * 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.manager.axis;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public interface IIdAxisManager {

-

-	/**

-	 *

-	 * @param path

-	 *            a path

-	 * @return

-	 *         the resolved object or <code>null</code> if it is not possible

-	 */

-	public Object resolvedPath(final String path);

-}

+/*****************************************************************************
+ * 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.manager.axis;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IIdAxisManager {
+
+	/**
+	 *
+	 * @param path
+	 *            a path
+	 * @return
+	 *         the resolved object or <code>null</code> if it is not possible
+	 */
+	public Object resolvedPath(final String path);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java
index 56658b01799..0dc2eaf5b2e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * 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.Comparator;

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.sort.ISortModel;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public interface ITreeItemAxisManagerForEventList extends IAxisManagerForEventList {

-

-	/**

-	 *

-	 * @param objectToTest

-	 *            an object

-	 * @param semanticParent

-	 *            the semantic parent of the object to test

-	 * @param conf

-	 *            the configuration which provides the object to test

-	 * @param depth

-	 *            the depth on which we want to apply this object

-	 * @return

-	 *         <code>true</code> if the object is accepted and false if not

-	 */

-	public boolean isAllowedContents(Object objectToTest, Object semanticParent, TreeFillingConfiguration conf, int depth);

-

-	/**

-	 *

-	 * @param sortModel

-	 *            the sort model to use

-	 * @param depth

-	 *            the depth for which we want sort the elements

-	 * @param axis1

-	 *            the first axis

-	 * @param axis2

-	 *            the second axis

-	 * @return

-	 * @see Comparator#compare(Object, Object)

-	 */

-	public int compare(final ISortModel sortModel, final int depth, final ITreeItemAxis axis1, final ITreeItemAxis axis2);

-

-	/**

-	 * @param element

-	 *            the expanded/collapsed element

-	 * @param path

-	 *            the path of the element

-	 * @param expanded

-	 *            if <code>true</code> the axis is expanded, if <code>false</code> the axis is collapsed

-	 */

-	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded);

-

-	/**

-	 * This method must fill the event list with

-	 * <ul>

-	 * <li>root element</li>

-	 * <li>child of the roots elements</li>

-	 * <li>child of child of the roots elements, for expanded roots</li>

-	 * </ul>

-	 *

-	 * the others child of child of ... will be added by {@link #fillListWithChildren(ITreeItemAxis)}

-	 */

-	public void fillListWithRoots();

-

-	/**

-	 *

-	 * This method fill the list with the children of the axis

-	 *

-	 * @param axis

-	 *            a tree item axis

-	 */

-	public void fillListWithChildren(final ITreeItemAxis axis);

-

-	/**

-	 *

-	 * @param toHide

-	 *            the list of the depths for which we want hide the categories, can be <code>null</code>

-	 * @param toShow

-	 *            the list of the depths for which we want display the categories, can be <code>null</code>

-	 */

-	public void managedHideShowCategoriesForDepth(List<Integer> toHide, List<Integer> toShow);

-

-}

+/*****************************************************************************
+ * 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.Comparator;
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITreeItemAxisManagerForEventList extends IAxisManagerForEventList {
+
+	/**
+	 *
+	 * @param objectToTest
+	 *            an object
+	 * @param semanticParent
+	 *            the semantic parent of the object to test
+	 * @param conf
+	 *            the configuration which provides the object to test
+	 * @param depth
+	 *            the depth on which we want to apply this object
+	 * @return
+	 *         <code>true</code> if the object is accepted and false if not
+	 */
+	public boolean isAllowedContents(Object objectToTest, Object semanticParent, TreeFillingConfiguration conf, int depth);
+
+	/**
+	 *
+	 * @param sortModel
+	 *            the sort model to use
+	 * @param depth
+	 *            the depth for which we want sort the elements
+	 * @param axis1
+	 *            the first axis
+	 * @param axis2
+	 *            the second axis
+	 * @return
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(final ISortModel sortModel, final int depth, final ITreeItemAxis axis1, final ITreeItemAxis axis2);
+
+	/**
+	 * @param element
+	 *            the expanded/collapsed element
+	 * @param path
+	 *            the path of the element
+	 * @param expanded
+	 *            if <code>true</code> the axis is expanded, if <code>false</code> the axis is collapsed
+	 */
+	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded);
+
+	/**
+	 * This method must fill the event list with
+	 * <ul>
+	 * <li>root element</li>
+	 * <li>child of the roots elements</li>
+	 * <li>child of child of the roots elements, for expanded roots</li>
+	 * </ul>
+	 *
+	 * the others child of child of ... will be added by {@link #fillListWithChildren(ITreeItemAxis)}
+	 */
+	public void fillListWithRoots();
+
+	/**
+	 *
+	 * This method fill the list with the children of the axis
+	 *
+	 * @param axis
+	 *            a tree item axis
+	 */
+	public void fillListWithChildren(final ITreeItemAxis axis);
+
+	/**
+	 *
+	 * @param toHide
+	 *            the list of the depths for which we want hide the categories, can be <code>null</code>
+	 * @param toShow
+	 *            the list of the depths for which we want display the categories, can be <code>null</code>
+	 */
+	public void managedHideShowCategoriesForDepth(List<Integer> toHide, List<Integer> toShow);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java
index ec44faf7129..bac1fb05775 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * 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.cell;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * This cell manager allows to display empty string in body cells when the row element is {@link TreeFillingConfiguration}

- *

- * @author Vincent Lorenzo

- *

- */

-public class TreeFillingConfigurationCellManager extends AbstractCellManager implements ICellManager {

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#handles(java.lang.Object, java.lang.Object, INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		return rowElement instanceof ITreeItemAxis && ((ITreeItemAxis) rowElement).getElement() instanceof TreeFillingConfiguration;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#isCellEditable(java.lang.Object, java.lang.Object, INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public boolean isCellEditable(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @param tableManager

-	 * @return

-	 */

-	@Override

-	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		return EMPTY_STRING;

-	}

-}

+/*****************************************************************************
+ * 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.cell;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * This cell manager allows to display empty string in body cells when the row element is {@link TreeFillingConfiguration}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeFillingConfigurationCellManager extends AbstractCellManager implements ICellManager {
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#handles(java.lang.Object, java.lang.Object, INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @return
+	 */
+	@Override
+	public boolean handles(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		return rowElement instanceof ITreeItemAxis && ((ITreeItemAxis) rowElement).getElement() instanceof TreeFillingConfiguration;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#isCellEditable(java.lang.Object, java.lang.Object, INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @return
+	 */
+	@Override
+	public boolean isCellEditable(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @param tableManager
+	 * @return
+	 */
+	@Override
+	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		return EMPTY_STRING;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
index d1c067e831d..8b6174c39ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * 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.List;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-

-

-/**

- * This interface is used to get the elements on the axis

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ITableAxisElementProvider {

-

-	/**

-	 *

-	 * @return

-	 *         the list of the elements displayed on columns

-	 */

-	public List<Object> getColumnElementsList();

-

-	/**

-	 *

-	 * @return

-	 *         the list of the elements displayed on rows

-	 */

-	public List<Object> getRowElementsList();

-

-	/**

-	 *

-	 * @param index

-	 *            the index of the wanted element

-	 * @return

-	 *         the column element for this index or <code>null</code>

-	 */

-	public Object getColumnElement(int index);

-

-	/**

-	 *

-	 * @param index

-	 *            the index of the wanted element

-	 * @return

-	 *         the row element for this index or <code>null</code>

-	 */

-	public Object getRowElement(int index);

-

-	/**

-	 *

-	 * @param columnElement

-	 *            the column element

-	 * @param rowElement

-	 *            the row element

-	 * @return

-	 *         the cell for this couple if existing on the model or <code>null</code>

-	 */

-	public Cell getCell(final Object columnElement, final Object rowElement);

-

-}

+/*****************************************************************************
+ * 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.List;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+
+
+/**
+ * This interface is used to get the elements on the axis
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITableAxisElementProvider {
+
+	/**
+	 *
+	 * @return
+	 *         the list of the elements displayed on columns
+	 */
+	public List<Object> getColumnElementsList();
+
+	/**
+	 *
+	 * @return
+	 *         the list of the elements displayed on rows
+	 */
+	public List<Object> getRowElementsList();
+
+	/**
+	 *
+	 * @param index
+	 *            the index of the wanted element
+	 * @return
+	 *         the column element for this index or <code>null</code>
+	 */
+	public Object getColumnElement(int index);
+
+	/**
+	 *
+	 * @param index
+	 *            the index of the wanted element
+	 * @return
+	 *         the row element for this index or <code>null</code>
+	 */
+	public Object getRowElement(int index);
+
+	/**
+	 *
+	 * @param columnElement
+	 *            the column element
+	 * @param rowElement
+	 *            the row element
+	 * @return
+	 *         the cell for this couple if existing on the model or <code>null</code>
+	 */
+	public Cell getCell(final Object columnElement, final Object rowElement);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
index fcac6fb200e..f4dec331fb4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.table;

-

-

-

-import java.util.List;

-

-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.tree.CollapseAndExpandActionsEnum;

-import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;

-

-import ca.odell.glazedlists.TreeList;

-

-/**

- * This interface provides methods for Tree Table table manager

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ITreeNattableModelManager extends INattableModelManager {

-

-	/**

-	 *

-	 * @return

-	 *         the tree format used for the table

-	 */

-	public DatumTreeFormat getTreeFormat();

-

-

-	/**

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         the depth of a ITreeItemAxis, that is to says, the number of {@link ITreeItemAxis} to cross to get the root {@link ITreeItemAxis}, included itself

-	 */

-	public int getTreeItemDepth(ITreeItemAxis axis);

-

-	/**

-	 *

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         the semantic depth, that is to say the number of semantic element before to cross to get the root {@link ITreeItemAxis}, included itself.

-	 *         if the {@link ITreeItemAxis} represents a {@link TreeFillingConfiguration}, we return the depth of the configruation

-	 */

-	public int getSemanticDepth(ITreeItemAxis axis);

-

-	/**

-	 * This method allows to show/hide categories in the row header. It calls {@link #hideShowCategories(List, List)} and {@link #hideShowColumnCategoriesInRowHeader(List, List)}.

-	 *

-	 * @param depthToHide

-	 *            the list of the depth for which we want to hide the categories

-	 * @param depthToShow

-	 *            the list of the depth for which we want to show the categories

-	 */

-	public void hideShowCategories(List<Integer> depthToHide, List<Integer> depthToShow);

-

-	/**

-	 * This methods allows to hide the rows representing categories (TreeFillingConfiguration)

-	 *

-	 * @param depthToHide

-	 *            the depth to hide

-	 * @param depthToShow

-	 *            the depth to show

-	 */

-	public void hideShowRowCategories(List<Integer> depthToHide, List<Integer> depthToShow);

-

-

-	/**

-	 * This methods allows to hide the column, in the row header representing categories (TreeFillingConfiguration)

-	 *

-	 * @param depthToHide

-	 *            the depth to hide

-	 * @param depthToShow

-	 *            the depth to show

-	 */

-	public void hideShowColumnCategoriesInRowHeader(List<Integer> depthToHide, List<Integer> depthToShow);

-

-

-	/**

-	 * The action to use to expand or collapse node in the table.

-	 * See {@link CollapseAndExpandActionsEnum}

-	 *

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param selectedAxis

-	 *            the list of axis to manage

-	 *            <ul>

-	 *            <li>this argument must be <code>null</code> for {@link CollapseAndExpandActionsEnum#COLLAPSE_ALL} and {@link CollapseAndExpandActionsEnum#EXPAND_ALL}</li>

-	 *            <li>for others values of {@link CollapseAndExpandActionsEnum}, if selectedAxis

-	 *            <ul>

-	 *            <li>is <code>null</code> we use the current selection of the table (fully selected rows)</li>

-	 *            <li>is not <code>null</code>, empty or with valid values, we use these axis instead of the current selection of the table</li>

-	 *            </ul>

-	 *            </ul>

-	 */

-	public void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis);

-

-	public TreeList getTreeList();

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.table;
+
+
+
+import java.util.List;
+
+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.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;
+
+import ca.odell.glazedlists.TreeList;
+
+/**
+ * This interface provides methods for Tree Table table manager
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITreeNattableModelManager extends INattableModelManager {
+
+	/**
+	 *
+	 * @return
+	 *         the tree format used for the table
+	 */
+	public DatumTreeFormat getTreeFormat();
+
+
+	/**
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         the depth of a ITreeItemAxis, that is to says, the number of {@link ITreeItemAxis} to cross to get the root {@link ITreeItemAxis}, included itself
+	 */
+	public int getTreeItemDepth(ITreeItemAxis axis);
+
+	/**
+	 *
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         the semantic depth, that is to say the number of semantic element before to cross to get the root {@link ITreeItemAxis}, included itself.
+	 *         if the {@link ITreeItemAxis} represents a {@link TreeFillingConfiguration}, we return the depth of the configruation
+	 */
+	public int getSemanticDepth(ITreeItemAxis axis);
+
+	/**
+	 * This method allows to show/hide categories in the row header. It calls {@link #hideShowCategories(List, List)} and {@link #hideShowColumnCategoriesInRowHeader(List, List)}.
+	 *
+	 * @param depthToHide
+	 *            the list of the depth for which we want to hide the categories
+	 * @param depthToShow
+	 *            the list of the depth for which we want to show the categories
+	 */
+	public void hideShowCategories(List<Integer> depthToHide, List<Integer> depthToShow);
+
+	/**
+	 * This methods allows to hide the rows representing categories (TreeFillingConfiguration)
+	 *
+	 * @param depthToHide
+	 *            the depth to hide
+	 * @param depthToShow
+	 *            the depth to show
+	 */
+	public void hideShowRowCategories(List<Integer> depthToHide, List<Integer> depthToShow);
+
+
+	/**
+	 * This methods allows to hide the column, in the row header representing categories (TreeFillingConfiguration)
+	 *
+	 * @param depthToHide
+	 *            the depth to hide
+	 * @param depthToShow
+	 *            the depth to show
+	 */
+	public void hideShowColumnCategoriesInRowHeader(List<Integer> depthToHide, List<Integer> depthToShow);
+
+
+	/**
+	 * The action to use to expand or collapse node in the table.
+	 * See {@link CollapseAndExpandActionsEnum}
+	 *
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param selectedAxis
+	 *            the list of axis to manage
+	 *            <ul>
+	 *            <li>this argument must be <code>null</code> for {@link CollapseAndExpandActionsEnum#COLLAPSE_ALL} and {@link CollapseAndExpandActionsEnum#EXPAND_ALL}</li>
+	 *            <li>for others values of {@link CollapseAndExpandActionsEnum}, if selectedAxis
+	 *            <ul>
+	 *            <li>is <code>null</code> we use the current selection of the table (fully selected rows)</li>
+	 *            <li>is not <code>null</code>, empty or with valid values, we use these axis instead of the current selection of the table</li>
+	 *            </ul>
+	 *            </ul>
+	 */
+	public void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis);
+
+	public TreeList getTreeList();
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
index b982c3efdcc..c094bc8f225 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
@@ -1,118 +1,118 @@
-/*****************************************************************************

- * 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.painter;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * This checkbox painter allows to display text into the cell

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomCheckBoxPainter extends CheckBoxPainter {

-

-	/**

-	 * the text painter used to paint N/A

-	 */

-	private TextPainter textPainter = new CustomizedCellPainter();

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getCellPainterAt(int, int, org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param x

-	 * @param y

-	 * @param cell

-	 * @param gc

-	 * @param bounds

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public ICellPainter getCellPainterAt(int x, int y, ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			return this;

-		}

-		return super.getCellPainterAt(x, y, cell, gc, bounds, configRegistry);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param bounds

-	 * @param configRegistry

-	 */

-	@Override

-	public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			this.textPainter.paintCell(cell, gc, bounds, configRegistry);

-			return;

-		}

-		super.paintCell(cell, gc, bounds, configRegistry);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredWidth(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public int getPreferredWidth(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			return textPainter.getPreferredWidth(cell, gc, configRegistry);

-		}

-		return super.getPreferredWidth(cell, gc, configRegistry);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredHeight(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public int getPreferredHeight(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			return textPainter.getPreferredHeight(cell, gc, configRegistry);

-		}

-		return super.getPreferredHeight(cell, gc, configRegistry);

-	}

-}

+/*****************************************************************************
+ * 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.painter;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This checkbox painter allows to display text into the cell
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomCheckBoxPainter extends CheckBoxPainter {
+
+	/**
+	 * the text painter used to paint N/A
+	 */
+	private TextPainter textPainter = new CustomizedCellPainter();
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getCellPainterAt(int, int, org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,
+	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param x
+	 * @param y
+	 * @param cell
+	 * @param gc
+	 * @param bounds
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public ICellPainter getCellPainterAt(int x, int y, ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			return this;
+		}
+		return super.getCellPainterAt(x, y, cell, gc, bounds, configRegistry);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,
+	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param bounds
+	 * @param configRegistry
+	 */
+	@Override
+	public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			this.textPainter.paintCell(cell, gc, bounds, configRegistry);
+			return;
+		}
+		super.paintCell(cell, gc, bounds, configRegistry);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredWidth(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public int getPreferredWidth(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			return textPainter.getPreferredWidth(cell, gc, configRegistry);
+		}
+		return super.getPreferredWidth(cell, gc, configRegistry);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredHeight(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public int getPreferredHeight(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			return textPainter.getPreferredHeight(cell, gc, configRegistry);
+		}
+		return super.getPreferredHeight(cell, gc, configRegistry);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
index 6a3343030a4..d821f4fa47c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * 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.painter;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.graphics.Image;

-

-/**

- *

- * Custom Image painter for the header of the table

- *

- */

-public class CustomImagePainter extends ImagePainter {

-

-	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getImage(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	protected Image getImage(ILayerCell cell, IConfigRegistry configRegistry) {

-		contextElement.setConfigRegistry(configRegistry);

-		contextElement.setCell(cell);

-		contextElement.setObject(cell.getDataValue());

-		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);

-		return provider.getImage(contextElement);

-	}

-}

+/*****************************************************************************
+ * 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.painter;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ *
+ * Custom Image painter for the header of the table
+ *
+ */
+public class CustomImagePainter extends ImagePainter {
+
+	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getImage(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	protected Image getImage(ILayerCell cell, IConfigRegistry configRegistry) {
+		contextElement.setConfigRegistry(configRegistry);
+		contextElement.setCell(cell);
+		contextElement.setObject(cell.getDataValue());
+		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);
+		return provider.getImage(contextElement);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java
index da866c421a4..cd6a434e185 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * 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.painter;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.layer.cell.TranslatedLayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;

-import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusBeveledBorderDecorator extends BeveledBorderDecorator {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param interiorPainter

-	 */

-	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter) {

-		super(interiorPainter);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param interiorPainter

-	 * @param uplift

-	 */

-	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter, boolean uplift) {

-		super(interiorPainter, uplift);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param adjustedCellBounds

-	 * @param configRegistry

-	 */

-	@Override

-	public void paintCell(ILayerCell cell, GC gc, Rectangle adjustedCellBounds, IConfigRegistry configRegistry) {

-		LabelStack labels = null;

-		if (cell instanceof TranslatedLayerCell) {

-			labels = cell.getConfigLabels();

-		}

-		if (labels != null) {

-			if (!labels.hasLabel(TreeLayer.TREE_COLUMN_CELL)) {

-				super.paintCell(cell, gc, adjustedCellBounds, configRegistry);

-				return;

-			} else {

-				if (getWrappedPainter() != null) {

-					getWrappedPainter().paintCell(cell, gc, adjustedCellBounds, configRegistry);

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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.painter;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.layer.cell.TranslatedLayerCell;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;
+import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusBeveledBorderDecorator extends BeveledBorderDecorator {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param interiorPainter
+	 */
+	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter) {
+		super(interiorPainter);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param interiorPainter
+	 * @param uplift
+	 */
+	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter, boolean uplift) {
+		super(interiorPainter, uplift);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,
+	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param adjustedCellBounds
+	 * @param configRegistry
+	 */
+	@Override
+	public void paintCell(ILayerCell cell, GC gc, Rectangle adjustedCellBounds, IConfigRegistry configRegistry) {
+		LabelStack labels = null;
+		if (cell instanceof TranslatedLayerCell) {
+			labels = cell.getConfigLabels();
+		}
+		if (labels != null) {
+			if (!labels.hasLabel(TreeLayer.TREE_COLUMN_CELL)) {
+				super.paintCell(cell, gc, adjustedCellBounds, configRegistry);
+				return;
+			} else {
+				if (getWrappedPainter() != null) {
+					getWrappedPainter().paintCell(cell, gc, adjustedCellBounds, configRegistry);
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java
index 88e4d0404b1..72925c8a911 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * 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.paste;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class AddToResource implements IValueSetter {

-

-	/**

-	 * the managed resource

-	 */

-	private final Resource resource;

-

-	/**

-	 * the object to add to the resource

-	 */

-	private final EObject toAdd;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param resource

-	 * @param feature

-	 * @param toAdd

-	 */

-	public AddToResource(final Resource resource, final EObject toAdd) {

-		this.resource = resource;

-		this.toAdd = toAdd;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.paste.IValueSetter#doSetValue(org.eclipse.emf.edit.domain.EditingDomain)

-	 *

-	 * @param domain

-	 */

-	@Override

-	public void doSetValue(EditingDomain domain) {

-		if (resource != null && toAdd != null) {

-			final Command cmd = new RecordingCommand((TransactionalEditingDomain) domain) {

-

-				@Override

-				protected void doExecute() {

-					resource.getContents().add(toAdd);

-				}

-			};

-			cmd.execute();

-		}

-	}

-}

+/*****************************************************************************
+ * 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.paste;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class AddToResource implements IValueSetter {
+
+	/**
+	 * the managed resource
+	 */
+	private final Resource resource;
+
+	/**
+	 * the object to add to the resource
+	 */
+	private final EObject toAdd;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param resource
+	 * @param feature
+	 * @param toAdd
+	 */
+	public AddToResource(final Resource resource, final EObject toAdd) {
+		this.resource = resource;
+		this.toAdd = toAdd;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.paste.IValueSetter#doSetValue(org.eclipse.emf.edit.domain.EditingDomain)
+	 *
+	 * @param domain
+	 */
+	@Override
+	public void doSetValue(EditingDomain domain) {
+		if (resource != null && toAdd != null) {
+			final Command cmd = new RecordingCommand((TransactionalEditingDomain) domain) {
+
+				@Override
+				protected void doExecute() {
+					resource.getContents().add(toAdd);
+				}
+			};
+			cmd.execute();
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java
index 8194cb14eac..ee8ff13813d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import java.util.Collection;

-import java.util.Map;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- * Common interface for paste post actions

- *

- * @author Vincent Lorenzo

- *

- */

-

-public interface IPastePostAction {

-

-	/**

-	 *

-	 * @param postActionId

-	 *            the id of the post action

-	 * @return

-	 *         <code>true</code> if this id is managed by the PostAction

-	 */

-	public boolean accept(final String postActionId);

-

-	/**

-	 * This method will be called one time by new pasted axis

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the post action id

-	 * @param editedElement

-	 *            the edited element

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 *

-	 *

-	 *

-	 */

-	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final Object editedElement, final Map<Object, Object> sharedMap);

-

-

-	/**

-	 * This method will be called one time, at the end of the paste action

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the post action id

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 */

-	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap);

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param object

-	 *            the object

-	 * @return

-	 *         the possible post actions for this object

-	 */

-	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object);

-

-}

+/*****************************************************************************
+ * 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.paste;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * Common interface for paste post actions
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+
+public interface IPastePostAction {
+
+	/**
+	 *
+	 * @param postActionId
+	 *            the id of the post action
+	 * @return
+	 *         <code>true</code> if this id is managed by the PostAction
+	 */
+	public boolean accept(final String postActionId);
+
+	/**
+	 * This method will be called one time by new pasted axis
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the post action id
+	 * @param editedElement
+	 *            the edited element
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 *
+	 *
+	 *
+	 */
+	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final Object editedElement, final Map<Object, Object> sharedMap);
+
+
+	/**
+	 * This method will be called one time, at the end of the paste action
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the post action id
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 */
+	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap);
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param object
+	 *            the object
+	 * @return
+	 *         the possible post actions for this object
+	 */
+	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java
index cdd9bbf3316..16bf17c18c1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-/**

- * Common interface used by the paste framework when we are not in the service edit.

- *

- *

- *

- * @author Vincent Lorenzo

- *

- */

-public interface IValueSetter {

-

-	/**

-	 *

-	 * This method will be used to set references, without using the service edit

-	 *

-	 * @param domain

-	 *            the editing domain

-	 */

-	public void doSetValue(final EditingDomain domain);

-}

+/*****************************************************************************
+ * 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.paste;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+/**
+ * Common interface used by the paste framework when we are not in the service edit.
+ *
+ *
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IValueSetter {
+
+	/**
+	 *
+	 * This method will be used to set references, without using the service edit
+	 *
+	 * @param domain
+	 *            the editing domain
+	 */
+	public void doSetValue(final EditingDomain domain);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java
index fe8851e48fb..390e9db4482 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java
@@ -1,144 +1,144 @@
-/*****************************************************************************

- * 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.paste;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- * The Paste Post Action registry

- *

- * @author Vincent Lorenzo

- *

- */

-public final class PastePostActionRegistry {

-

-

-	private static final String CLASS_MANAGER = "postActionClass"; //$NON-NLS-1$

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.paste.postactions"; //$NON-NLS-1$

-

-

-	private final Collection<IPastePostAction> postActions;

-

-	/**

-	 * The cell manager factory

-	 */

-	public static final PastePostActionRegistry INSTANCE = new PastePostActionRegistry();

-

-	/**

-	 *

-	 * Constructor.

-	 * Initialize the field of the class

-	 */

-	private PastePostActionRegistry() {

-		this.postActions = new ArrayList<IPastePostAction>();

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (final IConfigurationElement iConfigurationElement : configElements) {

-			try {

-				final IPastePostAction solver = (IPastePostAction) iConfigurationElement.createExecutableExtension(CLASS_MANAGER);

-				this.postActions.add(solver);

-			} catch (final CoreException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the post action id

-	 * @param tableContext

-	 * @param objectToEdit

-	 *            the object to edit

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 * @param axisAsString

-	 *

-	 */

-	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final EObject tableContext, final Object objectToEdit, final Map<Object, Object> sharedMap, final String axisAsString) {

-		final IPastePostAction postAction = getPostAction(postActionId);

-		if (postAction != null) {

-			postAction.doPostAction(tableManager, postActionId, objectToEdit, sharedMap);

-		} else {

-			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the id of the post action

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 */

-	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap) {

-		final IPastePostAction postAction = getPostAction(postActionId);

-		if (postAction != null) {

-			postAction.concludePostAction(tableManager, postActionId, sharedMap);

-		} else {

-			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$

-		}

-

-	}

-

-	/**

-	 *

-	 * @param postActionId

-	 * @return

-	 *         the post action managing this id

-	 */

-	private IPastePostAction getPostAction(final String postActionId) {

-		for (final IPastePostAction current : this.postActions) {

-			if (current.accept(postActionId)) {

-				return current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the current table manager

-	 * @param object

-	 *            an object

-	 * @return

-	 *         the possible post actions for this objects

-	 */

-	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object) {

-		final List<String> postActions = new ArrayList<String>();

-		for (final IPastePostAction current : this.postActions) {

-			postActions.addAll(current.getAvailablePostActionIds(tableManager, object));

-		}

-		Collections.sort(postActions);

-		return postActions;

-	}

-}

+/*****************************************************************************
+ * 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.paste;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * The Paste Post Action registry
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class PastePostActionRegistry {
+
+
+	private static final String CLASS_MANAGER = "postActionClass"; //$NON-NLS-1$
+
+	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.paste.postactions"; //$NON-NLS-1$
+
+
+	private final Collection<IPastePostAction> postActions;
+
+	/**
+	 * The cell manager factory
+	 */
+	public static final PastePostActionRegistry INSTANCE = new PastePostActionRegistry();
+
+	/**
+	 *
+	 * Constructor.
+	 * Initialize the field of the class
+	 */
+	private PastePostActionRegistry() {
+		this.postActions = new ArrayList<IPastePostAction>();
+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (final IConfigurationElement iConfigurationElement : configElements) {
+			try {
+				final IPastePostAction solver = (IPastePostAction) iConfigurationElement.createExecutableExtension(CLASS_MANAGER);
+				this.postActions.add(solver);
+			} catch (final CoreException e) {
+				Activator.log.error(e);
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the post action id
+	 * @param tableContext
+	 * @param objectToEdit
+	 *            the object to edit
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 * @param axisAsString
+	 *
+	 */
+	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final EObject tableContext, final Object objectToEdit, final Map<Object, Object> sharedMap, final String axisAsString) {
+		final IPastePostAction postAction = getPostAction(postActionId);
+		if (postAction != null) {
+			postAction.doPostAction(tableManager, postActionId, objectToEdit, sharedMap);
+		} else {
+			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the id of the post action
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 */
+	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap) {
+		final IPastePostAction postAction = getPostAction(postActionId);
+		if (postAction != null) {
+			postAction.concludePostAction(tableManager, postActionId, sharedMap);
+		} else {
+			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 *
+	 * @param postActionId
+	 * @return
+	 *         the post action managing this id
+	 */
+	private IPastePostAction getPostAction(final String postActionId) {
+		for (final IPastePostAction current : this.postActions) {
+			if (current.accept(postActionId)) {
+				return current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the current table manager
+	 * @param object
+	 *            an object
+	 * @return
+	 *         the possible post actions for this objects
+	 */
+	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object) {
+		final List<String> postActions = new ArrayList<String>();
+		for (final IPastePostAction current : this.postActions) {
+			postActions.addAll(current.getAvailablePostActionIds(tableManager, object));
+		}
+		Collections.sort(postActions);
+		return postActions;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
index 5907a7efd49..7cd70bf7ad9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * 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.paste;

-

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-

-

-/**

- *

- * Enumeration for cell delimiters in CSV files

- *

- */

-public enum PasteSeparator {

-	/**

-	 * tabulation value

-	 */

-	TABULATION('\t', Messages.PasteSeparator_Tabulation),

-

-	/**

-	 * semicolon value

-	 */

-	SEMICOLON(';', Messages.PasteSeparator_Semicolon),

-

-	/**

-	 * Comma value

-	 */

-	COMMA(',', Messages.PasteSeparator_Comma),

-	/**

-	 * space value

-	 */

-	SPACE(' ', Messages.PasteSeparator_Space),

-

-	/**

-	 * other value

-	 */

-	OTHER(Messages.PasteSeparator_Other);

-

-	/**

-	 * the separator itself

-	 */

-	private final char separator;

-

-	/**

-	 * the name of the separator

-	 */

-	private final String name;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param name

-	 */

-	private PasteSeparator(final String name) {

-		this(Character.MIN_VALUE, name);// MIN_VALUE is a value as other one!

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param separator

-	 * @param name

-	 */

-	private PasteSeparator(char separator, String name) {

-		this.separator = separator;

-		this.name = name;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the separator to use

-	 */

-	public char getSeparator() {

-		if (this == OTHER) {

-			throw new UnsupportedOperationException();

-		}

-		return separator;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the name of the separator

-	 */

-	public String getName() {

-		return name;

-	}

-}

+/*****************************************************************************
+ * 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.paste;
+
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+
+
+/**
+ *
+ * Enumeration for cell delimiters in CSV files
+ *
+ */
+public enum PasteSeparator {
+	/**
+	 * tabulation value
+	 */
+	TABULATION('\t', Messages.PasteSeparator_Tabulation),
+
+	/**
+	 * semicolon value
+	 */
+	SEMICOLON(';', Messages.PasteSeparator_Semicolon),
+
+	/**
+	 * Comma value
+	 */
+	COMMA(',', Messages.PasteSeparator_Comma),
+	/**
+	 * space value
+	 */
+	SPACE(' ', Messages.PasteSeparator_Space),
+
+	/**
+	 * other value
+	 */
+	OTHER(Messages.PasteSeparator_Other);
+
+	/**
+	 * the separator itself
+	 */
+	private final char separator;
+
+	/**
+	 * the name of the separator
+	 */
+	private final String name;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param name
+	 */
+	private PasteSeparator(final String name) {
+		this(Character.MIN_VALUE, name);// MIN_VALUE is a value as other one!
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param separator
+	 * @param name
+	 */
+	private PasteSeparator(char separator, String name) {
+		this.separator = separator;
+		this.name = name;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the separator to use
+	 */
+	public char getSeparator() {
+		if (this == OTHER) {
+			throw new UnsupportedOperationException();
+		}
+		return separator;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the name of the separator
+	 */
+	public String getName() {
+		return name;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java
index 8f69af0ea70..465102d958f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java
@@ -1,110 +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.paste;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-/**

- * A structure which is used to store values to set for a given feature and a given object

- *

- * @author Vincent Lorenzo

- *

- */

-public class ReferenceValueSetter implements IValueSetter {

-

-	/**

-	 * the feature to edit

-	 */

-	private final EReference eReference;

-

-	/**

-	 * the edited object

-	 */

-	private final EObject editedObject;

-

-	/**

-	 * the new value

-	 */

-	protected final Object value;

-

-	/**

-	 * if true, the current value will be erased

-	 */

-	private final boolean eraseExistingMultiValueValue;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editedObject

-	 *            the edited object

-	 * @param feature

-	 *            the edited feature

-	 * @param value

-	 *            the value for this feature. If the feature is multivalued, the newValue will be added to the existing value

-	 */

-	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value) {

-		this(editedObject, feature, value, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editedObject

-	 *            the edited object

-	 * @param feature

-	 *            the edited feature

-	 * @param value

-	 *            the value for this feature.

-	 * @param eraseExistingMultiValueValue

-	 *            if <code>true</code>, in case of multivalued references, the current value will be replaced by {@code tutu} , if <code>false</code> we

-	 *            will add {@code tutu} to the current value

-	 *            , will be added to the current value

-	 */

-	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value, final boolean eraseExistingMultiValueValue) {

-		this.eReference = feature;

-		this.editedObject = editedObject;

-		this.value = value;

-		this.eraseExistingMultiValueValue = eraseExistingMultiValueValue;

-	}

-

-	/**

-	 * set the value of the reference

-	 *

-	 * @param domain

-	 *            the editing domain used to do the action

-	 */

-	@Deprecated

-	// deprecated since october 2013. use doSetValue instead of this method

-	public void setReferenceValue(final EditingDomain domain) {

-		doSetValue(domain);

-	}

-

-	@Override

-	public void doSetValue(final EditingDomain domain) {

-		if (this.eReference.isMany() && !this.eraseExistingMultiValueValue && this.value instanceof Collection<?>) {

-			Collection<?> collection = (Collection<?>) value;

-			AddCommand.create(domain, editedObject, eReference, collection).execute();

-		} else {

-			SetCommand.create(domain, editedObject, eReference, value).execute();

-		}

-	}

-}

+/*****************************************************************************
+ * 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.paste;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+/**
+ * A structure which is used to store values to set for a given feature and a given object
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ReferenceValueSetter implements IValueSetter {
+
+	/**
+	 * the feature to edit
+	 */
+	private final EReference eReference;
+
+	/**
+	 * the edited object
+	 */
+	private final EObject editedObject;
+
+	/**
+	 * the new value
+	 */
+	protected final Object value;
+
+	/**
+	 * if true, the current value will be erased
+	 */
+	private final boolean eraseExistingMultiValueValue;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editedObject
+	 *            the edited object
+	 * @param feature
+	 *            the edited feature
+	 * @param value
+	 *            the value for this feature. If the feature is multivalued, the newValue will be added to the existing value
+	 */
+	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value) {
+		this(editedObject, feature, value, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editedObject
+	 *            the edited object
+	 * @param feature
+	 *            the edited feature
+	 * @param value
+	 *            the value for this feature.
+	 * @param eraseExistingMultiValueValue
+	 *            if <code>true</code>, in case of multivalued references, the current value will be replaced by {@code tutu} , if <code>false</code> we
+	 *            will add {@code tutu} to the current value
+	 *            , will be added to the current value
+	 */
+	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value, final boolean eraseExistingMultiValueValue) {
+		this.eReference = feature;
+		this.editedObject = editedObject;
+		this.value = value;
+		this.eraseExistingMultiValueValue = eraseExistingMultiValueValue;
+	}
+
+	/**
+	 * set the value of the reference
+	 *
+	 * @param domain
+	 *            the editing domain used to do the action
+	 */
+	@Deprecated
+	// deprecated since october 2013. use doSetValue instead of this method
+	public void setReferenceValue(final EditingDomain domain) {
+		doSetValue(domain);
+	}
+
+	@Override
+	public void doSetValue(final EditingDomain domain) {
+		if (this.eReference.isMany() && !this.eraseExistingMultiValueValue && this.value instanceof Collection<?>) {
+			Collection<?> collection = (Collection<?>) value;
+			AddCommand.create(domain, editedObject, eReference, collection).execute();
+		} else {
+			SetCommand.create(domain, editedObject, eReference, value).execute();
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
index c7b6eb6df4c..7b0d24c769e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * 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.paste;

-

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-

-/**

- *

- * Enumeration for text delimiters

- *

- */

-public enum TextDelimiter {

-

-	/**

-	 * the single quote

-	 */

-	SINGLE_QUOTE('\'', Messages.TextDelimiter_Quote),

-

-	/**

-	 * the double quote

-	 */

-	DOUBLE_QUOTE('"', Messages.TextDelimiter_DoubleQuote);

-

-	/**

-	 * the delimiter itself

-	 */

-	private final char delimiter;

-

-	/**

-	 * the name of the delimiter

-	 */

-	private final String name;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param delimiter

-	 * @param name

-	 */

-	private TextDelimiter(char delimiter, String name) {

-		this.delimiter = delimiter;

-		this.name = name;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the separator to use

-	 */

-	public char getDelimiter() {

-		return delimiter;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the name of the separator

-	 */

-	public String getName() {

-		return name;

-	}

-}

+/*****************************************************************************
+ * 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.paste;
+
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+
+/**
+ *
+ * Enumeration for text delimiters
+ *
+ */
+public enum TextDelimiter {
+
+	/**
+	 * the single quote
+	 */
+	SINGLE_QUOTE('\'', Messages.TextDelimiter_Quote),
+
+	/**
+	 * the double quote
+	 */
+	DOUBLE_QUOTE('"', Messages.TextDelimiter_DoubleQuote);
+
+	/**
+	 * the delimiter itself
+	 */
+	private final char delimiter;
+
+	/**
+	 * the name of the delimiter
+	 */
+	private final String name;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param delimiter
+	 * @param name
+	 */
+	private TextDelimiter(char delimiter, String name) {
+		this.delimiter = delimiter;
+		this.name = name;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the separator to use
+	 */
+	public char getDelimiter() {
+		return delimiter;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the name of the separator
+	 */
+	public String getName() {
+		return name;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
index 8d490798977..7f13de2db35 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * Copyright (c) 2010 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.preferences;

-

-import org.eclipse.core.runtime.preferences.IScopeContext;

-import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore;

-import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;

-

-/**

- * this class is a specific store that is used to look for value of element

- * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram

- *

- */

-public class PapyrusTablePreferenceStore extends AbstractPapyrusPreferenceStore {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param context

-	 * @param qualifier

-	 * @param defaultQualifierPath

-	 */

-	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {

-		super(context, qualifier, defaultQualifierPath, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);

-	}

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param context

-	 * @param qualifier

-	 */

-	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier) {

-		super(context, qualifier, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])

-	 *

-	 * @param keys

-	 * @return

-	 */

-	@Override

-	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {

-		throw new UnsupportedOperationException("not yet implemented"); //$NON-NLS-1$

-	}

-

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.preferences;
+
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore;
+import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;
+
+/**
+ * this class is a specific store that is used to look for value of element
+ * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram
+ *
+ */
+public class PapyrusTablePreferenceStore extends AbstractPapyrusPreferenceStore {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param context
+	 * @param qualifier
+	 * @param defaultQualifierPath
+	 */
+	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {
+		super(context, qualifier, defaultQualifierPath, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);
+	}
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param context
+	 * @param qualifier
+	 */
+	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier) {
+		super(context, qualifier, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])
+	 *
+	 * @param keys
+	 * @return
+	 */
+	@Override
+	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {
+		throw new UnsupportedOperationException("not yet implemented"); //$NON-NLS-1$
+	}
+
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
index 72be0357b29..c2b136d31d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * 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.preferences;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class TablePreferencesConstantsHelper {

-

-	private TablePreferencesConstantsHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * Prefix for preference for Papyrus nattable Level editor

-	 */

-	public final static String PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_TABLE_EDITOR"; //$NON-NLS-1$

-

-	/**

-	 * Prefix for preference for Diagram Level

-	 */

-	public final static String TABLE_PREFERENCE_PREFIX = "NATTABLE_"; //$NON-NLS-1$

-

-	/**

-	 * Prefix for preference for element Level

-	 */

-	public final static String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$

-

-	/**

-	 * Get the preference constant used to store the preference of an element.

-	 *

-	 * @param elementName

-	 *            the name of the element

-	 * @param preferenceType

-	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}

-	 * @return the constant used.

-	 */

-	public static String getConstant(String elementName, int preferenceType) {

-		throw new UnsupportedOperationException("Not yet implemented");//$NON-NLS-1$

-		// StringBuffer sb = new StringBuffer();

-		// sb.append(elementName);

-		//		sb.append("."); //$NON-NLS-1$

-		// switch(preferenceType) {

-		//

-		// default:

-		// break;

-		// }

-		// return sb.toString();

-	}

-

-	/**

-	 *

-	 * @param preferenceType

-	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}

-	 * @return get the preference key at the papyrus editor level

-	 */

-	public static String getPapyrusEditorConstant(int preferenceType) {

-		return getConstant(PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, preferenceType);

-	}

-

-	/**

-	 *

-	 * @param diagramKind

-	 *            the kind of diagram.

-	 * @param preferenceType

-	 *            the type of preference to store. It must be a value defined in {@link PreferenceConstantHelper}

-	 * @return the preference key at the diagram level

-	 */

-	public static String getNatTableConstant(String tableKind, int preferenceType) {

-		return TABLE_PREFERENCE_PREFIX + getConstant(tableKind, preferenceType);

-	}

-}

+/*****************************************************************************
+ * 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.preferences;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TablePreferencesConstantsHelper {
+
+	private TablePreferencesConstantsHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * Prefix for preference for Papyrus nattable Level editor
+	 */
+	public final static String PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_TABLE_EDITOR"; //$NON-NLS-1$
+
+	/**
+	 * Prefix for preference for Diagram Level
+	 */
+	public final static String TABLE_PREFERENCE_PREFIX = "NATTABLE_"; //$NON-NLS-1$
+
+	/**
+	 * Prefix for preference for element Level
+	 */
+	public final static String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$
+
+	/**
+	 * Get the preference constant used to store the preference of an element.
+	 *
+	 * @param elementName
+	 *            the name of the element
+	 * @param preferenceType
+	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}
+	 * @return the constant used.
+	 */
+	public static String getConstant(String elementName, int preferenceType) {
+		throw new UnsupportedOperationException("Not yet implemented");//$NON-NLS-1$
+		// StringBuffer sb = new StringBuffer();
+		// sb.append(elementName);
+		//		sb.append("."); //$NON-NLS-1$
+		// switch(preferenceType) {
+		//
+		// default:
+		// break;
+		// }
+		// return sb.toString();
+	}
+
+	/**
+	 *
+	 * @param preferenceType
+	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}
+	 * @return get the preference key at the papyrus editor level
+	 */
+	public static String getPapyrusEditorConstant(int preferenceType) {
+		return getConstant(PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, preferenceType);
+	}
+
+	/**
+	 *
+	 * @param diagramKind
+	 *            the kind of diagram.
+	 * @param preferenceType
+	 *            the type of preference to store. It must be a value defined in {@link PreferenceConstantHelper}
+	 * @return the preference key at the diagram level
+	 */
+	public static String getNatTableConstant(String tableKind, int preferenceType) {
+		return TABLE_PREFERENCE_PREFIX + getConstant(tableKind, preferenceType);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
index efe1713a9b1..bdd7352d77e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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.provider;

-

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-

-/**

- * The label provider used for the index of the header

- *

- * @author Vincent Lorenzo

- *

- */

-public class IndexHeaderLabelProvider extends AbstractNattableCellLabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		if (element instanceof ILabelProviderContextElementWrapper) {

-			Object object = ((ILabelProviderContextElementWrapper) element).getObject();

-			return object instanceof String || object instanceof Integer;

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		return ((ILabelProviderContextElementWrapper) element).getObject().toString();

-	}

-}

+/*****************************************************************************
+ * 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.provider;
+
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+
+/**
+ * The label provider used for the index of the header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class IndexHeaderLabelProvider extends AbstractNattableCellLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean accept(Object element) {
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			return object instanceof String || object instanceof Integer;
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public String getText(Object element) {
+		return ((ILabelProviderContextElementWrapper) element).getObject().toString();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java
index b580fda46ba..77c4ed8604f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.provider;

-

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;

-

-/**

- * Label Provider for problem

- *

- * @author Vincent Lorenzo

- *

- */

-public class ProblemLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		return element instanceof Problem;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider#getText(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected String getText(final EObject element) {

-		final Problem pb = (Problem) element;

-		if (pb instanceof StringResolutionProblem) {

-			return ((StringResolutionProblem) pb).getValueAsString();

-		}

-		return pb.getDescription();

-	}

-

-	/**

-	 *

-	 * @param element

-	 *            a problem

-	 * @return

-	 *         the text to display for a problem in a tooltip

-	 */

-	// TODO : should be obtained using a service or a specific wrapper to get tooltip

-	public String getTooltipText(final EObject element) {

-		if (element instanceof Problem) {

-			final Problem problem = (Problem) element;

-			final StringBuilder builder = new StringBuilder();

-			if (problem instanceof StringResolutionProblem) {

-				final List<String> unresolvedStrings = ((StringResolutionProblem) problem).getUnresolvedString();

-				builder.append(NLS.bind(Messages.ProblemLabelProvider_StringsValuesCanBeResolved, unresolvedStrings.size()));

-				if (unresolvedStrings.size() == 1) {

-					builder.append(" "); //$NON-NLS-1$

-					builder.append(unresolvedStrings.get(0));

-				} else {

-					final Iterator<String> iterOnString = ((StringResolutionProblem) problem).getUnresolvedString().iterator();

-					while (iterOnString.hasNext()) {

-						builder.append("\n\t- "); //$NON-NLS-1$

-						builder.append(iterOnString.next());

-					}

-				}

-			} else {

-				builder.append(problem.getDescription());

-			}

-			return builder.toString();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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.provider;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
+
+/**
+ * Label Provider for problem
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ProblemLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean accept(Object element) {
+		return element instanceof Problem;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider#getText(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	protected String getText(final EObject element) {
+		final Problem pb = (Problem) element;
+		if (pb instanceof StringResolutionProblem) {
+			return ((StringResolutionProblem) pb).getValueAsString();
+		}
+		return pb.getDescription();
+	}
+
+	/**
+	 *
+	 * @param element
+	 *            a problem
+	 * @return
+	 *         the text to display for a problem in a tooltip
+	 */
+	// TODO : should be obtained using a service or a specific wrapper to get tooltip
+	public String getTooltipText(final EObject element) {
+		if (element instanceof Problem) {
+			final Problem problem = (Problem) element;
+			final StringBuilder builder = new StringBuilder();
+			if (problem instanceof StringResolutionProblem) {
+				final List<String> unresolvedStrings = ((StringResolutionProblem) problem).getUnresolvedString();
+				builder.append(NLS.bind(Messages.ProblemLabelProvider_StringsValuesCanBeResolved, unresolvedStrings.size()));
+				if (unresolvedStrings.size() == 1) {
+					builder.append(" "); //$NON-NLS-1$
+					builder.append(unresolvedStrings.get(0));
+				} else {
+					final Iterator<String> iterOnString = ((StringResolutionProblem) problem).getUnresolvedString().iterator();
+					while (iterOnString.hasNext()) {
+						builder.append("\n\t- "); //$NON-NLS-1$
+						builder.append(iterOnString.next());
+					}
+				}
+			} else {
+				builder.append(problem.getDescription());
+			}
+			return builder.toString();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
index f155cdd0d1c..6ffe13fd900 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * 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.reorder;

-

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.events.MouseEvent;

-

-/**

- *

- * This custom Cell Drag Mode allows to hide the phantom of the header when the drag of column is forbidden

- *

- */

-public class CustomCellDragModeForColumn extends CellDragMode {

-

-	/**

-	 * The manager of the table

-	 */

-	private final INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the manager of the table

-	 */

-	public CustomCellDragModeForColumn(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseDown(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseDown(natTable, event);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseMove(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseMove(natTable, event);

-		}

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseUp(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseUp(natTable, event);

-		}

-

-	}

-

-

-}

+/*****************************************************************************
+ * 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.reorder;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.events.MouseEvent;
+
+/**
+ *
+ * This custom Cell Drag Mode allows to hide the phantom of the header when the drag of column is forbidden
+ *
+ */
+public class CustomCellDragModeForColumn extends CellDragMode {
+
+	/**
+	 * The manager of the table
+	 */
+	private final INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the manager of the table
+	 */
+	public CustomCellDragModeForColumn(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseDown(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseDown(natTable, event);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseMove(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseMove(natTable, event);
+		}
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseUp(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseUp(natTable, event);
+		}
+
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
index 34a37f3574b..e3891ee8467 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * 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.reorder;

-

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.events.MouseEvent;

-

-/**

- *

- * This custom Drag Mode for columns allows to restrict the Drag of the Column

- *

- */

-public class CustomColumnReorderDragMode extends ColumnReorderDragMode {

-

-	/**

-	 * the table manager

-	 */

-	private INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the table manager

-	 */

-	public CustomColumnReorderDragMode(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseDown(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseDown(natTable, event);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseMove(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseMove(natTable, event);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseUp(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseUp(natTable, event);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.reorder;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.events.MouseEvent;
+
+/**
+ *
+ * This custom Drag Mode for columns allows to restrict the Drag of the Column
+ *
+ */
+public class CustomColumnReorderDragMode extends ColumnReorderDragMode {
+
+	/**
+	 * the table manager
+	 */
+	private INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the table manager
+	 */
+	public CustomColumnReorderDragMode(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseDown(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseDown(natTable, event);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseMove(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseMove(natTable, event);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseUp(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseUp(natTable, event);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
index d8d86094ca2..5bf18998d2b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * 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.reorder;

-

-import org.eclipse.nebula.widgets.nattable.reorder.config.DefaultColumnReorderBindings;

-import org.eclipse.nebula.widgets.nattable.ui.action.AggregateDragMode;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.SWT;

-

-/**

- *

- * This bindings allows to move the columns, only when the manager allows it.

- *

- */

-public class CustomDefaultColumnReorderBindings extends DefaultColumnReorderBindings {

-

-	/**

-	 * the table manager

-	 */

-	private final INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the table manager

-	 */

-	public CustomDefaultColumnReorderBindings(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.config.DefaultReorderBindings#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		assert manager != null;

-		uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CustomCellDragModeForColumn(this.manager), new CustomColumnReorderDragMode(this.manager)));

-	}

-

-}

+/*****************************************************************************
+ * 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.reorder;
+
+import org.eclipse.nebula.widgets.nattable.reorder.config.DefaultColumnReorderBindings;
+import org.eclipse.nebula.widgets.nattable.ui.action.AggregateDragMode;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.SWT;
+
+/**
+ *
+ * This bindings allows to move the columns, only when the manager allows it.
+ *
+ */
+public class CustomDefaultColumnReorderBindings extends DefaultColumnReorderBindings {
+
+	/**
+	 * the table manager
+	 */
+	private final INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the table manager
+	 */
+	public CustomDefaultColumnReorderBindings(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.config.DefaultReorderBindings#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		assert manager != null;
+		uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CustomCellDragModeForColumn(this.manager), new CustomColumnReorderDragMode(this.manager)));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
index 5e1dfd38dc2..fe621758b2d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * 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.selection;

-

-import java.util.Collection;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-/**

- * @author Vincent Lorenzo

- *         This interface is used to obtain real object provided by a structured selection.

- *         It allows to remove emf dependencies during the manipulation of the contents of the table

- */

-public interface ISelectionExtractor {

-

-	/**

-	 * 

-	 * @param structuredSelection

-	 *            a structured selection

-	 * @return

-	 *         a collection representing the object encapsulated in the selection

-	 */

-	public Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection);

-

-}

+/*****************************************************************************
+ * 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.selection;
+
+import java.util.Collection;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+/**
+ * @author Vincent Lorenzo
+ *         This interface is used to obtain real object provided by a structured selection.
+ *         It allows to remove emf dependencies during the manipulation of the contents of the table
+ */
+public interface ISelectionExtractor {
+
+	/**
+	 * 
+	 * @param structuredSelection
+	 *            a structured selection
+	 * @return
+	 *         a collection representing the object encapsulated in the selection
+	 */
+	public Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
index d4a8ba7d872..11369ff84cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * 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.selection;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-/**

- * @author Vincent Lorenzo

- *         This class has been created to avoid dependencies on EMF manipulating eobject referenced by the table

- */

-public class ObjectsSelectionExtractor implements ISelectionExtractor {

-

-

-	/**

-	 * 

-	 * @param structuredSelection

-	 *            a structured selection

-	 * @return

-	 *         the object owned by the selected

-	 */

-	public final Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {

-		List<Object> result = new ArrayList<Object>(structuredSelection.size());

- 

-		for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) {

-			Object realObject = getRealObject(iter.next());

-			if (realObject != null) {

-				result.add(realObject);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * 

-	 * @param object

-	 *            an object

-	 * @return

-	 *         the real object

-	 */

-	protected Object getRealObject(final Object object) {

-		return object;

-	}

-}

+/*****************************************************************************
+ * 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.selection;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+/**
+ * @author Vincent Lorenzo
+ *         This class has been created to avoid dependencies on EMF manipulating eobject referenced by the table
+ */
+public class ObjectsSelectionExtractor implements ISelectionExtractor {
+
+
+	/**
+	 * 
+	 * @param structuredSelection
+	 *            a structured selection
+	 * @return
+	 *         the object owned by the selected
+	 */
+	public final Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {
+		List<Object> result = new ArrayList<Object>(structuredSelection.size());
+ 
+		for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) {
+			Object realObject = getRealObject(iter.next());
+			if (realObject != null) {
+				result.add(realObject);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param object
+	 *            an object
+	 * @return
+	 *         the real object
+	 */
+	protected Object getRealObject(final Object object) {
+		return object;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
index 46a83d1523d..f8371996db4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
@@ -1,267 +1,267 @@
-/*****************************************************************************

- * 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.sort;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-import java.util.List;

-import java.util.ListIterator;

-import java.util.Map;

-

-import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;

-import org.eclipse.papyrus.infra.nattable.comparator.RowComparator;

-import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.tools.comparator.CompositeComparator;

-

-

-/**

- * @Deprecated since Eclipse Mars

- *  @author Vincent Lorenzo

- *

- */

-@Deprecated

-public class ColumnSortModel implements IPapyrusSortModel {

-

-

-	/**

-	 * the list of the sorted columns, in the order of the sort

-	 */

-	private final List<Object> sortedColumns = new ArrayList<Object>();

-

-	/**

-	 * the sorted columns associated to their direction

-	 */

-	private final Map<Object, SortDirectionEnum> sortedColumnsAndDirection = new HashMap<Object, SortDirectionEnum>();

-

-	/**

-	 * the table manager

-	 */

-	private INattableModelManager tableManager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableManager

-	 *            the table manager to use

-	 */

-	public ColumnSortModel(final INattableModelManager tableManager) {

-		this.tableManager = tableManager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortedColumnIndexes()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<Integer> getSortedColumnIndexes() {

-		final List<Integer> sortedColumnsIndex = new ArrayList<Integer>();

-		for (final Object current : sortedColumns) {

-			sortedColumnsIndex.add(getColumnIndex(current));

-		}

-		return sortedColumnsIndex;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#isColumnIndexSorted(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public boolean isColumnIndexSorted(int columnIndex) {

-		return sortedColumns.contains(getObject(columnIndex));

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortDirection(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public SortDirectionEnum getSortDirection(int columnIndex) {

-		Object object = getObject(columnIndex);

-		SortDirectionEnum direction = sortedColumnsAndDirection.get(object);

-		if (direction == null) {

-			direction = SortDirectionEnum.NONE;

-		}

-		return direction;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortOrder(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public int getSortOrder(int columnIndex) {

-		final Object obj = getObject(columnIndex);

-		return this.sortedColumns.indexOf(obj);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getComparatorsForColumnIndex(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public List<Comparator> getComparatorsForColumnIndex(int columnIndex) {

-		Comparator comp = new RowComparator(getObject(columnIndex), sortedColumnsAndDirection.get(getObject(columnIndex)), tableManager);

-		return Collections.singletonList(comp);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#sort(int, org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum, boolean)

-	 *

-	 * @param columnIndex

-	 * @param sortDirection

-	 * @param accumulate

-	 */

-	@Override

-	public void sort(int columnIndex, SortDirectionEnum sortDirection, boolean accumulate) {

-		final Object columnElement = getObject(columnIndex);

-

-		if (!accumulate) {

-			clear();

-		}

-

-		this.sortedColumns.remove(columnElement);

-		this.sortedColumnsAndDirection.remove(columnElement);

-		if (sortDirection != SortDirectionEnum.NONE) {

-			this.sortedColumnsAndDirection.put(columnElement, sortDirection);

-			this.sortedColumns.add(0, columnElement);

-		}

-		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();

-		for (final Object current : sortedColumns) {

-			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);

-			comparators.add(newOne);

-		}

-		setAxisComparator();

-	}

-

-	/**

-	 * set the axis comparator (the sort is done by the manager when we change its comparator)

-	 */

-	protected void setAxisComparator() {

-		final Comparator<Object> comp = createComparator();

-		final ICompositeAxisManager manager = (ICompositeAxisManager) tableManager.getRowAxisManager();

-		manager.setAxisComparator(comp);// the sort is done by the manager when we change its comparator

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the created axis comparator to use or <code>null</code>

-	 */

-	protected final Comparator<Object> createComparator() {

-		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();

-		for (final Object current : sortedColumns) {

-			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);

-			comparators.add(newOne);

-		}

-

-		final Comparator<Object> comp;

-		if (comparators.isEmpty()) {

-			comp = null;

-		} else {

-			comp = new CompositeComparator<Object>(comparators);

-		}

-		return comp;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#clear()

-	 *

-	 */

-	@Override

-	public void clear() {

-		sortedColumns.clear();

-		sortedColumnsAndDirection.clear();

-	}

-

-	/**

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	private Object getObject(int columnIndex) {

-		return tableManager.getColumnElement(columnIndex);

-	}

-

-	/**

-	 *

-	 * @param object

-	 * @return

-	 */

-	private int getColumnIndex(final Object object) {

-		return tableManager.getColumnElementsList().indexOf(object);

-	}

-

-	/**

-	 * clear the comparator list, according to the removed columns

-	 */

-	@Override

-	public void updateSort() {

-		final ListIterator<Object> iterator = this.sortedColumns.listIterator();

-		while (iterator.hasNext()) {

-			final Object current = iterator.next();

-			if (-1 == tableManager.getColumnElementsList().indexOf(current)) {

-				iterator.remove();

-				this.sortedColumnsAndDirection.remove(current);

-				this.sortedColumns.remove(current);

-			}

-		}

-		setAxisComparator();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getColumnComparator(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public Comparator<?> getColumnComparator(int columnIndex) {

-		

-		//TODO : new method coming from nattable 1.2.0

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.sort.IPapyrusSortModel#setTableInverted(boolean)

-	 *

-	 * @param isInverted

-	 */

-	@Override

-	public void setTableInverted(boolean isInverted) {

-		

-		

-	}

-}

-

+/*****************************************************************************
+ * 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.sort;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.comparator.RowComparator;
+import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.tools.comparator.CompositeComparator;
+
+
+/**
+ * @Deprecated since Eclipse Mars
+ *  @author Vincent Lorenzo
+ *
+ */
+@Deprecated
+public class ColumnSortModel implements IPapyrusSortModel {
+
+
+	/**
+	 * the list of the sorted columns, in the order of the sort
+	 */
+	private final List<Object> sortedColumns = new ArrayList<Object>();
+
+	/**
+	 * the sorted columns associated to their direction
+	 */
+	private final Map<Object, SortDirectionEnum> sortedColumnsAndDirection = new HashMap<Object, SortDirectionEnum>();
+
+	/**
+	 * the table manager
+	 */
+	private INattableModelManager tableManager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableManager
+	 *            the table manager to use
+	 */
+	public ColumnSortModel(final INattableModelManager tableManager) {
+		this.tableManager = tableManager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortedColumnIndexes()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Integer> getSortedColumnIndexes() {
+		final List<Integer> sortedColumnsIndex = new ArrayList<Integer>();
+		for (final Object current : sortedColumns) {
+			sortedColumnsIndex.add(getColumnIndex(current));
+		}
+		return sortedColumnsIndex;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#isColumnIndexSorted(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public boolean isColumnIndexSorted(int columnIndex) {
+		return sortedColumns.contains(getObject(columnIndex));
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortDirection(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public SortDirectionEnum getSortDirection(int columnIndex) {
+		Object object = getObject(columnIndex);
+		SortDirectionEnum direction = sortedColumnsAndDirection.get(object);
+		if (direction == null) {
+			direction = SortDirectionEnum.NONE;
+		}
+		return direction;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortOrder(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public int getSortOrder(int columnIndex) {
+		final Object obj = getObject(columnIndex);
+		return this.sortedColumns.indexOf(obj);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getComparatorsForColumnIndex(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public List<Comparator> getComparatorsForColumnIndex(int columnIndex) {
+		Comparator comp = new RowComparator(getObject(columnIndex), sortedColumnsAndDirection.get(getObject(columnIndex)), tableManager);
+		return Collections.singletonList(comp);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#sort(int, org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum, boolean)
+	 *
+	 * @param columnIndex
+	 * @param sortDirection
+	 * @param accumulate
+	 */
+	@Override
+	public void sort(int columnIndex, SortDirectionEnum sortDirection, boolean accumulate) {
+		final Object columnElement = getObject(columnIndex);
+
+		if (!accumulate) {
+			clear();
+		}
+
+		this.sortedColumns.remove(columnElement);
+		this.sortedColumnsAndDirection.remove(columnElement);
+		if (sortDirection != SortDirectionEnum.NONE) {
+			this.sortedColumnsAndDirection.put(columnElement, sortDirection);
+			this.sortedColumns.add(0, columnElement);
+		}
+		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();
+		for (final Object current : sortedColumns) {
+			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);
+			comparators.add(newOne);
+		}
+		setAxisComparator();
+	}
+
+	/**
+	 * set the axis comparator (the sort is done by the manager when we change its comparator)
+	 */
+	protected void setAxisComparator() {
+		final Comparator<Object> comp = createComparator();
+		final ICompositeAxisManager manager = (ICompositeAxisManager) tableManager.getRowAxisManager();
+		manager.setAxisComparator(comp);// the sort is done by the manager when we change its comparator
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the created axis comparator to use or <code>null</code>
+	 */
+	protected final Comparator<Object> createComparator() {
+		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();
+		for (final Object current : sortedColumns) {
+			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);
+			comparators.add(newOne);
+		}
+
+		final Comparator<Object> comp;
+		if (comparators.isEmpty()) {
+			comp = null;
+		} else {
+			comp = new CompositeComparator<Object>(comparators);
+		}
+		return comp;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#clear()
+	 *
+	 */
+	@Override
+	public void clear() {
+		sortedColumns.clear();
+		sortedColumnsAndDirection.clear();
+	}
+
+	/**
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	private Object getObject(int columnIndex) {
+		return tableManager.getColumnElement(columnIndex);
+	}
+
+	/**
+	 *
+	 * @param object
+	 * @return
+	 */
+	private int getColumnIndex(final Object object) {
+		return tableManager.getColumnElementsList().indexOf(object);
+	}
+
+	/**
+	 * clear the comparator list, according to the removed columns
+	 */
+	@Override
+	public void updateSort() {
+		final ListIterator<Object> iterator = this.sortedColumns.listIterator();
+		while (iterator.hasNext()) {
+			final Object current = iterator.next();
+			if (-1 == tableManager.getColumnElementsList().indexOf(current)) {
+				iterator.remove();
+				this.sortedColumnsAndDirection.remove(current);
+				this.sortedColumns.remove(current);
+			}
+		}
+		setAxisComparator();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getColumnComparator(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public Comparator<?> getColumnComparator(int columnIndex) {
+		
+		//TODO : new method coming from nattable 1.2.0
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.sort.IPapyrusSortModel#setTableInverted(boolean)
+	 *
+	 * @param isInverted
+	 */
+	@Override
+	public void setTableInverted(boolean isInverted) {
+		
+		
+	}
+}
+
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java
index bc4d65a703d..8e393651191 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * 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.sort;

-

-import org.eclipse.nebula.widgets.nattable.sort.ISortModel;

-

-/**

- * Common interface to use for sort model

- *

- * @author Vincent Lorenzo

- *

- */

-public interface IPapyrusSortModel extends ISortModel {

-

-	/**

-	 * remove axis which have been destroyed from the comparison

-	 */

-	public void updateSort();

-

-	/**

-	 * 

-	 * @param isInverted

-	 *            <code>true</code> when the table isInverted

-	 */

-	public void setTableInverted(boolean isInverted);

-}

+/*****************************************************************************
+ * 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.sort;
+
+import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
+
+/**
+ * Common interface to use for sort model
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IPapyrusSortModel extends ISortModel {
+
+	/**
+	 * remove axis which have been destroyed from the comparison
+	 */
+	public void updateSort();
+
+	/**
+	 * 
+	 * @param isInverted
+	 *            <code>true</code> when the table isInverted
+	 */
+	public void setTableInverted(boolean isInverted);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
index 5172b329ef5..f67209bc899 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * 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.tester;

-

-import org.eclipse.core.runtime.IStatus;

-

-/**

- * The interface to implements for the table creation tester

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ITableTester {

-

-	/**

-	 *

-	 * @param context

-	 * @return

-	 *         a status indicating if the table can be created

-	 */

-	public IStatus isAllowed(final Object context);

-

-}

+/*****************************************************************************
+ * 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.tester;
+
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * The interface to implements for the table creation tester
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITableTester {
+
+	/**
+	 *
+	 * @param context
+	 * @return
+	 *         a status indicating if the table can be created
+	 */
+	public IStatus isAllowed(final Object context);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
index 7eb4148a5e5..3b3121fa390 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * 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.tester;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-

-

-public class TableTesterRegistry {

-

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.tester"; //$NON-NLS-1$

-

-	private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

-

-	private static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$

-

-	private Map<String, ITableTester> testers;

-

-	public static final TableTesterRegistry INSTANCE = new TableTesterRegistry();

-

-	private TableTesterRegistry() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param tableType

-	 *            the type of the table

-	 * @return

-	 *         the URI of the configuration to use for this table or <code>null</code> if not found

-	 */

-	public ITableTester getTableTester(final String testerId) {

-		if (this.testers == null) {

-			this.testers = new HashMap<String, ITableTester>();

-			final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-			for (final IConfigurationElement iConfigurationElement : configElements) {

-				String id = iConfigurationElement.getAttribute(ID_ATTRIBUTE);

-				if (this.testers.containsKey(id)) {

-					Activator.log.warn(String.format(Messages.TableTesterRegistry_SeveralTesterAreRegisteredWithTheSameId, id));

-				} else {

-					ITableTester tester = null;

-					try {

-						tester = (ITableTester) iConfigurationElement.createExecutableExtension(CLASS_ATTRIBUTE);

-						this.testers.put(id, tester);

-					} catch (CoreException e) {

-						Activator.log.error(String.format(Messages.TableTesterRegistry_TheClassCantBeLoaded, id), e);

-					}

-

-				}

-			}

-		}

-		return this.testers.get(testerId);

-	}

-}

+/*****************************************************************************
+ * 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.tester;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+
+
+public class TableTesterRegistry {
+
+
+	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.tester"; //$NON-NLS-1$
+
+	private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+	private static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$
+
+	private Map<String, ITableTester> testers;
+
+	public static final TableTesterRegistry INSTANCE = new TableTesterRegistry();
+
+	private TableTesterRegistry() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param tableType
+	 *            the type of the table
+	 * @return
+	 *         the URI of the configuration to use for this table or <code>null</code> if not found
+	 */
+	public ITableTester getTableTester(final String testerId) {
+		if (this.testers == null) {
+			this.testers = new HashMap<String, ITableTester>();
+			final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+			for (final IConfigurationElement iConfigurationElement : configElements) {
+				String id = iConfigurationElement.getAttribute(ID_ATTRIBUTE);
+				if (this.testers.containsKey(id)) {
+					Activator.log.warn(String.format(Messages.TableTesterRegistry_SeveralTesterAreRegisteredWithTheSameId, id));
+				} else {
+					ITableTester tester = null;
+					try {
+						tester = (ITableTester) iConfigurationElement.createExecutableExtension(CLASS_ATTRIBUTE);
+						this.testers.put(id, tester);
+					} catch (CoreException e) {
+						Activator.log.error(String.format(Messages.TableTesterRegistry_TheClassCantBeLoaded, id), e);
+					}
+
+				}
+			}
+		}
+		return this.testers.get(testerId);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
index 97079304c0b..088eb8aec61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * 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;

-

-/**

- * This enumeration provides all possible actions for Tree (Collapse/Expand)

- *

- */

-public enum CollapseAndExpandActionsEnum {

-	/**

-	 * expand all the tree

-	 */

-	EXPAND_ALL,

-

-	/**

-	 * expand one level from the selected elements

-	 */

-	EXPAND_ONE_LEVEL,

-

-	/**

-	 * expand 2 levels from the selected elements

-	 */

-	EXPAND_TWO_LEVEL,

-

-	/**

-	 * expand all from the selected element

-	 */

-	EXPAND_ALL_FROM_SELECTION,

-

-	/**

-	 * expand tree to find the wanted node

-	 */

-	EXPAND_TO_NODE,

-

-	/**

-	 * collapse all the tree

-	 */

-	COLLAPSE_ALL,

-

-	/**

-	 * collapse all from the selection

-	 */

-	COLLAPSE_ALL_FROM_SELECTION,

-

-	/**

-	 * collapse one level from selected elements

-	 */

-	COLLAPSE_ONE_LEVEL;

-

-

-

-}

+/*****************************************************************************
+ * 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;
+
+/**
+ * This enumeration provides all possible actions for Tree (Collapse/Expand)
+ *
+ */
+public enum CollapseAndExpandActionsEnum {
+	/**
+	 * expand all the tree
+	 */
+	EXPAND_ALL,
+
+	/**
+	 * expand one level from the selected elements
+	 */
+	EXPAND_ONE_LEVEL,
+
+	/**
+	 * expand 2 levels from the selected elements
+	 */
+	EXPAND_TWO_LEVEL,
+
+	/**
+	 * expand all from the selected element
+	 */
+	EXPAND_ALL_FROM_SELECTION,
+
+	/**
+	 * expand tree to find the wanted node
+	 */
+	EXPAND_TO_NODE,
+
+	/**
+	 * collapse all the tree
+	 */
+	COLLAPSE_ALL,
+
+	/**
+	 * collapse all from the selection
+	 */
+	COLLAPSE_ALL_FROM_SELECTION,
+
+	/**
+	 * collapse one level from selected elements
+	 */
+	COLLAPSE_ONE_LEVEL;
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java
index 0e6b58661d9..2a675d143c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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.List;

-

-import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-

-import ca.odell.glazedlists.TreeList;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class DatumExpansionModel implements TreeList.ExpansionModel<ITreeItemAxis> {

-

-	/**

-	 * the editing domain used in the table

-	 */

-	private ITreeItemAxisManagerForEventList axisManager;

-

-	/**

-	 *

-	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#isExpanded(java.lang.Object, java.util.List)

-	 *

-	 * @param element

-	 * @param path

-	 * @return

-	 */

-	@Override

-	public boolean isExpanded(ITreeItemAxis element, List<ITreeItemAxis> path) {

-		return element.isExpanded();

-	}

-

-	/**

-	 *

-	 * @param axisManager

-	 *            the axis manager

-	 */

-	public void setAxisManager(ITreeItemAxisManagerForEventList axisManager) {

-		this.axisManager = axisManager;

-	}

-

-	/**

-	 *

-	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#setExpanded(java.lang.Object, java.util.List, boolean)

-	 *

-	 * @param element

-	 * @param path

-	 * @param expanded

-	 */

-	@Override

-	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {

-		if (this.axisManager != null) {

-			this.axisManager.setExpanded(element, path, expanded);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.List;
+
+import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+
+import ca.odell.glazedlists.TreeList;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class DatumExpansionModel implements TreeList.ExpansionModel<ITreeItemAxis> {
+
+	/**
+	 * the editing domain used in the table
+	 */
+	private ITreeItemAxisManagerForEventList axisManager;
+
+	/**
+	 *
+	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#isExpanded(java.lang.Object, java.util.List)
+	 *
+	 * @param element
+	 * @param path
+	 * @return
+	 */
+	@Override
+	public boolean isExpanded(ITreeItemAxis element, List<ITreeItemAxis> path) {
+		return element.isExpanded();
+	}
+
+	/**
+	 *
+	 * @param axisManager
+	 *            the axis manager
+	 */
+	public void setAxisManager(ITreeItemAxisManagerForEventList axisManager) {
+		this.axisManager = axisManager;
+	}
+
+	/**
+	 *
+	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#setExpanded(java.lang.Object, java.util.List, boolean)
+	 *
+	 * @param element
+	 * @param path
+	 * @param expanded
+	 */
+	@Override
+	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {
+		if (this.axisManager != null) {
+			this.axisManager.setExpanded(element, path, expanded);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
index f649842b931..b283e671444 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
@@ -1,108 +1,108 @@
-/*****************************************************************************

- * 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;

-

-import java.util.Comparator;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-

-/**

- * The comparator used to sort IAxis

- *

- * @author Vincent Lorenzo

- *

- */

-public class AxisComparator implements Comparator<IAxis> {

-

-	/**

-	 * indicates the direction of the sort

-	 */

-	private boolean alphabeticOrder;

-

-	/**

-	 * the config registry is used to find the label provider service

-	 */

-	private IConfigRegistry configRegistry;

-

-	private LabelProviderContextElementWrapper wrapper1;

-	

-	private LabelProviderContextElementWrapper wrapper2;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param alphabeticOrder

-	 *            indicates the direction of the sort

-	 * @param configRegistry

-	 *            the config registry used by the table

-	 */

-	public AxisComparator(boolean alphabticOrder, final IConfigRegistry configRegistry) {

-		this.alphabeticOrder = alphabticOrder;

-		this.configRegistry = configRegistry;

-		wrapper1 = new LabelProviderContextElementWrapper();

-		wrapper2 = new LabelProviderContextElementWrapper();

-		wrapper1.setConfigRegistry(configRegistry);

-		wrapper2.setConfigRegistry(configRegistry);

-	}

-

-	/**

-	 * Compare 2 {@link IAxis}

-	 *

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 *

-	 * @param arg0

-	 * @param arg1

-	 * @return

-	 */

-	@Override

-	public int compare(IAxis arg0, IAxis arg1) {

-		final LabelProviderService serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		wrapper1.setObject(arg0);

-		wrapper2.setObject(arg1);

-		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-		

-		final String str1 = provider.getText(wrapper1).replaceAll(AxisUtils.REGEX, "");// we keep only words characters (letters + numbers) + whitespace //$NON-NLS-1$

-		final String str2 = provider.getText(wrapper2).replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$

-		if (this.alphabeticOrder) {

-			return str1.compareToIgnoreCase(str2);

-		}

-		return str2.compareToIgnoreCase(str1);

-

-	}

-

-	/**

-	 *

-	 * @param serv

-	 *            the label provider service

-	 * @param obj

-	 *            the object for which we want the displayed text

-	 * @return

-	 * 

-	 * @Deprecated since Eclipse Mars

-	 */

-	@Deprecated

-	protected String getText(final LabelProviderService serv, final Object obj) {

-		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-		LabelProviderContextElementWrapper wrapper = new LabelProviderContextElementWrapper();

-		wrapper.setConfigRegistry(this.configRegistry);

-		wrapper.setObject(obj);

-		return provider.getText(wrapper);

-	}

-}

+/*****************************************************************************
+ * 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;
+
+import java.util.Comparator;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+
+/**
+ * The comparator used to sort IAxis
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class AxisComparator implements Comparator<IAxis> {
+
+	/**
+	 * indicates the direction of the sort
+	 */
+	private boolean alphabeticOrder;
+
+	/**
+	 * the config registry is used to find the label provider service
+	 */
+	private IConfigRegistry configRegistry;
+
+	private LabelProviderContextElementWrapper wrapper1;
+	
+	private LabelProviderContextElementWrapper wrapper2;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param alphabeticOrder
+	 *            indicates the direction of the sort
+	 * @param configRegistry
+	 *            the config registry used by the table
+	 */
+	public AxisComparator(boolean alphabticOrder, final IConfigRegistry configRegistry) {
+		this.alphabeticOrder = alphabticOrder;
+		this.configRegistry = configRegistry;
+		wrapper1 = new LabelProviderContextElementWrapper();
+		wrapper2 = new LabelProviderContextElementWrapper();
+		wrapper1.setConfigRegistry(configRegistry);
+		wrapper2.setConfigRegistry(configRegistry);
+	}
+
+	/**
+	 * Compare 2 {@link IAxis}
+	 *
+	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+	 *
+	 * @param arg0
+	 * @param arg1
+	 * @return
+	 */
+	@Override
+	public int compare(IAxis arg0, IAxis arg1) {
+		final LabelProviderService serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		wrapper1.setObject(arg0);
+		wrapper2.setObject(arg1);
+		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);
+		
+		final String str1 = provider.getText(wrapper1).replaceAll(AxisUtils.REGEX, "");// we keep only words characters (letters + numbers) + whitespace //$NON-NLS-1$
+		final String str2 = provider.getText(wrapper2).replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$
+		if (this.alphabeticOrder) {
+			return str1.compareToIgnoreCase(str2);
+		}
+		return str2.compareToIgnoreCase(str1);
+
+	}
+
+	/**
+	 *
+	 * @param serv
+	 *            the label provider service
+	 * @param obj
+	 *            the object for which we want the displayed text
+	 * @return
+	 * 
+	 * @Deprecated since Eclipse Mars
+	 */
+	@Deprecated
+	protected String getText(final LabelProviderService serv, final Object obj) {
+		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);
+		LabelProviderContextElementWrapper wrapper = new LabelProviderContextElementWrapper();
+		wrapper.setConfigRegistry(this.configRegistry);
+		wrapper.setObject(obj);
+		return provider.getText(wrapper);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java
index 379788cfd4d..0026158865e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class AxisConfigurationUtils {

-

-	private AxisConfigurationUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param eClass

-	 *            the eclass of the wanted configuration

-	 * @param onColumn

-	 *            <code>true</code> if we want a column configuration and false if we want a row configuration

-	 * @return

-	 */

-	public static IAxisConfiguration getIAxisConfigurationUsedInTable(final Table table, final EClass eClass, final boolean onColumn) {

-		IAxisConfiguration iAxisConfiguration = null;

-		final Collection<AbstractHeaderAxisConfiguration> headerConfigurations = new ArrayList<AbstractHeaderAxisConfiguration>();

-		if (onColumn) {

-			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-			localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-		} else {

-			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-			localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-		}

-		final Iterator<AbstractHeaderAxisConfiguration> iter = headerConfigurations.iterator();

-		while (iter.hasNext() && iAxisConfiguration == null) {

-			final Iterator<IAxisConfiguration> confIter = iter.next().getOwnedAxisConfigurations().iterator();

-			while (confIter.hasNext() && iAxisConfiguration == null) {

-				final IAxisConfiguration current = confIter.next();

-				if (current.eClass() == eClass) {

-					iAxisConfiguration = current;

-				}

-			}

-		}

-		return iAxisConfiguration;

-	}

-}

+/*****************************************************************************
+ * 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;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class AxisConfigurationUtils {
+
+	private AxisConfigurationUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param eClass
+	 *            the eclass of the wanted configuration
+	 * @param onColumn
+	 *            <code>true</code> if we want a column configuration and false if we want a row configuration
+	 * @return
+	 */
+	public static IAxisConfiguration getIAxisConfigurationUsedInTable(final Table table, final EClass eClass, final boolean onColumn) {
+		IAxisConfiguration iAxisConfiguration = null;
+		final Collection<AbstractHeaderAxisConfiguration> headerConfigurations = new ArrayList<AbstractHeaderAxisConfiguration>();
+		if (onColumn) {
+			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+			localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+		} else {
+			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+			localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+		}
+		final Iterator<AbstractHeaderAxisConfiguration> iter = headerConfigurations.iterator();
+		while (iter.hasNext() && iAxisConfiguration == null) {
+			final Iterator<IAxisConfiguration> confIter = iter.next().getOwnedAxisConfigurations().iterator();
+			while (confIter.hasNext() && iAxisConfiguration == null) {
+				final IAxisConfiguration current = confIter.next();
+				if (current.eClass() == eClass) {
+					iAxisConfiguration = current;
+				}
+			}
+		}
+		return iAxisConfiguration;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java
index e4bf912ffb7..3ffa6eea6a5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-

-

-/**

- * This class is used as key to find easily the cell for a row and a column in the table metamodel

- *

- * @author Vincent Lorenzo

- *

- */

-public class CellMapKey {

-

-

-

-	/**

-	 * the column element

-	 */

-	private final Object columnElement;

-

-	/**

-	 * the row element

-	 */

-	private final Object rowElement;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param columnElement

-	 *            the columnElement

-	 * @param rowElement

-	 *            the rowElement

-	 */

-	public CellMapKey(final Object columnElement, final Object rowElement) {

-		if (columnElement instanceof ICellAxisWrapper) {

-			this.columnElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) columnElement).getElement());

-		} else {

-			this.columnElement = AxisUtils.getRepresentedElement(columnElement);

-		}

-		if (rowElement instanceof ICellAxisWrapper) {

-			this.rowElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) rowElement).getElement());

-		} else {

-			this.rowElement = AxisUtils.getRepresentedElement(rowElement);

-		}

-	}

-

-	/**

-	 *

-	 * @see java.lang.Object#hashCode()

-	 *

-	 * @return

-	 */

-	@Override

-	public int hashCode() {

-		int hashCode = this.columnElement.hashCode() + 10 * this.rowElement.hashCode();

-		return hashCode;

-	}

-

-	/**

-	 *

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 *

-	 * @param obj

-	 * @return

-	 */

-	@Override

-	public boolean equals(Object obj) {

-		if (obj instanceof CellMapKey) {

-			return obj.hashCode() == hashCode();

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+
+
+/**
+ * This class is used as key to find easily the cell for a row and a column in the table metamodel
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CellMapKey {
+
+
+
+	/**
+	 * the column element
+	 */
+	private final Object columnElement;
+
+	/**
+	 * the row element
+	 */
+	private final Object rowElement;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param columnElement
+	 *            the columnElement
+	 * @param rowElement
+	 *            the rowElement
+	 */
+	public CellMapKey(final Object columnElement, final Object rowElement) {
+		if (columnElement instanceof ICellAxisWrapper) {
+			this.columnElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) columnElement).getElement());
+		} else {
+			this.columnElement = AxisUtils.getRepresentedElement(columnElement);
+		}
+		if (rowElement instanceof ICellAxisWrapper) {
+			this.rowElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) rowElement).getElement());
+		} else {
+			this.rowElement = AxisUtils.getRepresentedElement(rowElement);
+		}
+	}
+
+	/**
+	 *
+	 * @see java.lang.Object#hashCode()
+	 *
+	 * @return
+	 */
+	@Override
+	public int hashCode() {
+		int hashCode = this.columnElement.hashCode() + 10 * this.rowElement.hashCode();
+		return hashCode;
+	}
+
+	/**
+	 *
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 *
+	 * @param obj
+	 * @return
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof CellMapKey) {
+			return obj.hashCode() == hashCode();
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
index fc09a521a1a..85bbf36ce8e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
@@ -1,454 +1,454 @@
-/*****************************************************************************

- * 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.utils;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.tree.command.TreeCollapseAllCommand;

-import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandAllCommand;

-import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandCollapseCommand;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;

-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;

-import org.eclipse.papyrus.infra.ui.util.SelectionHelper;

-

-/**

- * This class is not in API.

- */

-public class CollapseExpandActionHelper {

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 */

-	private CollapseExpandActionHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * This method is not in the API.

-	 * 

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param axisProvider

-	 *            the table axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	public static final void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		switch (actionId) {

-		case EXPAND_ALL:

-			natTable.doCommand(new TreeExpandAllCommand());

-			return;

-		case COLLAPSE_ALL:

-			doCollapseAll(axisProvider, natTable);

-			return;

-		default:

-			break;

-		}

-

-		if (selectedAxis == null) {

-			doCollapseExpandActionOnSelection(actionId, axisProvider, natTable);

-		} else {

-			doCollapseExpandActionOnChoosenRows(actionId, selectedAxis, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * Do the collapse all action

-	 * 

-	 * @param axisProvider

-	 *            the axis provider

-	 * @param natTable

-	 *            the nattable widget

-	 */

-	private static final void doCollapseAll(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		natTable.doCommand(new TreeCollapseAllCommand());

-

-		// with collapse all, we must check than the root category is not hidden. If the root is hidden, the table will be displayed as empty

-		//added thanks to the bug 463312  

-		if (axisProvider instanceof INattableModelManager && StyleUtils.isHiddenDepth((INattableModelManager) axisProvider, 0)) {

-			List<Object> rows = axisProvider.getRowElementsList();

-			List<ITreeItemAxis> axis = new ArrayList<ITreeItemAxis>();

-			for (Object current : rows) {

-				Assert.isTrue(current instanceof ITreeItemAxis);

-				Assert.isTrue(((ITreeItemAxis) current).getParent() == null);

-				axis.add((ITreeItemAxis) current);

-			}

-			doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, axis, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * 

-	 * This method does the wanted action according to the current selection of the table

-	 * 

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param axisProvider

-	 *            the table axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void doCollapseExpandActionOnSelection(CollapseAndExpandActionsEnum actionId, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		switch (actionId) {

-		case COLLAPSE_ALL_FROM_SELECTION:

-			collapseAllFromSelectedRows(axisProvider, natTable);

-			return;

-		case COLLAPSE_ONE_LEVEL:

-			collapseSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_TWO_LEVEL:

-			expandOn2LevelsSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_ALL_FROM_SELECTION:

-			expandAllFromSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_ONE_LEVEL:

-			expandFromSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_TO_NODE:

-			// nothing to do

-			return;

-		default:

-			return;

-		}

-	}

-

-	/**

-	 * 

-	 * This method does the wanted action according to the @param selectedRows

-	 * 

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param selectedRows

-	 *            the rows on which the action must be done

-	 * @param axisProvider

-	 *            the table axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedRows, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		switch (actionId) {

-		case COLLAPSE_ALL_FROM_SELECTION:

-			collapseAllRows(selectedRows, axisProvider, natTable);

-			break;

-		case COLLAPSE_ONE_LEVEL:

-			collapseRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_ALL_FROM_SELECTION:

-			expandAllRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_ONE_LEVEL:

-			expandRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_TO_NODE:

-			expandToRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_TWO_LEVEL:

-			expandOn2LevelsRows(selectedRows, axisProvider, natTable);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * This method allows to expand the selected rows on 2 levels

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandOn2LevelsRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();

-		for (ITreeItemAxis current : axis) {

-

-			toExpand.add(current);

-			if (!current.isExpanded() && current.getChildren().size() > 0) {

-				int index = axisProvider.getRowElementsList().indexOf(current);

-				if (index != -1) {

-					natTable.doCommand(new TreeExpandCollapseCommand(index));

-				}

-			}

-		}

-		for (ITreeItemAxis current : toExpand) {

-			for (ITreeItemAxis child : current.getChildren()) {

-				if (!child.isExpanded() && child.getChildren().size() > 0) {

-					int index = axisProvider.getRowElementsList().indexOf(child);

-					if (index != -1) {

-						natTable.doCommand(new TreeExpandCollapseCommand(index));

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 * @param axisProvider

-	 * @param natTable

-	 */

-	private static final void expandRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			if (!current.isExpanded()) {

-				int index = axisProvider.getRowElementsList().indexOf(current);

-				if (index != -1) {

-					natTable.doCommand(new TreeExpandCollapseCommand(index));

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 * @param axisProvider

-	 * @param natTable

-	 */

-	private static final void expandAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			expandFullBranch(current, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 * @param axisProvider

-	 * @param natTable

-	 */

-	private static final void collapseAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			if (current.isExpanded()) {

-				collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);

-			}

-		}

-	}

-

-	/**

-	 * @param axis

-	 *            the list of axis to collapse

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			int index = axisProvider.getRowElementsList().indexOf(axis);

-			if (index != -1 && current.isExpanded()) {

-				natTable.doCommand(new TreeExpandCollapseCommand(index));

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * This method expands parents of nodes to display these nodes in the table

-	 * 

-	 * @param axis

-	 *            a list of axis to show in the table

-	 * @param axisProvider

-	 *            an axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void expandToRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			expandToNode(current, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * This action expands the parents axis of the axis, in order to display it

-	 * 

-	 * @param axis

-	 *            an axis

-	 * @param axisProvider

-	 *            the axis provider of the table

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void expandToNode(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		List<ITreeItemAxis> axisToExpand = new ArrayList<ITreeItemAxis>();

-		ITreeItemAxis parent = axis.getParent();

-		while (parent != null) {

-			if (!parent.isExpanded()) {

-				axisToExpand.add(parent);

-			}

-			parent = parent.getParent();

-		}

-		for (ITreeItemAxis current : axisToExpand) {

-			int index = axisProvider.getRowElementsList().indexOf(current);

-			natTable.doCommand(new TreeExpandCollapseCommand(index));

-		}

-	}

-

-	/**

-	 * this method allows to collapse the selection

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				if (axis.isExpanded()) {

-					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));

-				}

-			}

-		}

-	}

-

-	/**

-	 * this method allows to expand the selection

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				if (!axis.isExpanded()) {

-					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));

-				}

-			}

-		}

-	}

-

-	/**

-	 * this method allows to collapse all nodes for the selection

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				if (axis.isExpanded()) {

-					collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 *            an axis

-	 *            this method collapse all ITreeItemAxis of the branch

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		// NatTable nattable = this.eventData.getNatTable();

-		if (axis.isExpanded() && axis.getChildren().size() > 0) {

-			int index = axisProvider.getRowElementsList().indexOf(axis);

-			for (ITreeItemAxis child : axis.getChildren()) {

-				collapseFullBranch(child, axisProvider, natTable);

-			}

-			natTable.doCommand(new TreeExpandCollapseCommand(index));

-		}

-	}

-

-	/**

-	 * This method allows to expand the selected rows on 2 levels

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandOn2LevelsSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				toExpand.add(axis);

-				if (!axis.isExpanded() && axis.getChildren().size() > 0) {

-					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));

-				}

-			}

-		}

-		for (ITreeItemAxis current : toExpand) {

-			for (ITreeItemAxis child : current.getChildren()) {

-				if (!child.isExpanded() && child.getChildren().size() > 0) {

-					int index = axisProvider.getRowElementsList().indexOf(child);

-					natTable.doCommand(new TreeExpandCollapseCommand(index));

-

-				}

-			}

-		}

-	}

-

-	/**

-	 * @return

-	 *         a map with the selected rows

-	 */

-	private static Map<Integer, Object> getFullySelectedRows() {

-		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();

-		if (selection instanceof TableStructuredSelection) {

-			TableStructuredSelection tableSelection = (TableStructuredSelection) selection;

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) tableSelection.getAdapter(TableSelectionWrapper.class);

-			return wrapper.getFullySelectedRows();

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * This method allows to expand all the sub-item of the selected items

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				expandFullBranch((ITreeItemAxis) value, axisProvider, natTable);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            the axis for which we want to expand the whole branch

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		if (!axis.isExpanded() && axis.getChildren().size() > 0) {

-			int index = axisProvider.getRowElementsList().indexOf(axis);

-			natTable.doCommand(new TreeExpandCollapseCommand(index));

-			for (ITreeItemAxis child : axis.getChildren()) {

-				expandFullBranch(child, axisProvider, natTable);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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.utils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.tree.command.TreeCollapseAllCommand;
+import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandAllCommand;
+import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandCollapseCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.infra.ui.util.SelectionHelper;
+
+/**
+ * This class is not in API.
+ */
+public class CollapseExpandActionHelper {
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 */
+	private CollapseExpandActionHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * This method is not in the API.
+	 * 
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param axisProvider
+	 *            the table axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	public static final void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		switch (actionId) {
+		case EXPAND_ALL:
+			natTable.doCommand(new TreeExpandAllCommand());
+			return;
+		case COLLAPSE_ALL:
+			doCollapseAll(axisProvider, natTable);
+			return;
+		default:
+			break;
+		}
+
+		if (selectedAxis == null) {
+			doCollapseExpandActionOnSelection(actionId, axisProvider, natTable);
+		} else {
+			doCollapseExpandActionOnChoosenRows(actionId, selectedAxis, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * Do the collapse all action
+	 * 
+	 * @param axisProvider
+	 *            the axis provider
+	 * @param natTable
+	 *            the nattable widget
+	 */
+	private static final void doCollapseAll(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		natTable.doCommand(new TreeCollapseAllCommand());
+
+		// with collapse all, we must check than the root category is not hidden. If the root is hidden, the table will be displayed as empty
+		//added thanks to the bug 463312  
+		if (axisProvider instanceof INattableModelManager && StyleUtils.isHiddenDepth((INattableModelManager) axisProvider, 0)) {
+			List<Object> rows = axisProvider.getRowElementsList();
+			List<ITreeItemAxis> axis = new ArrayList<ITreeItemAxis>();
+			for (Object current : rows) {
+				Assert.isTrue(current instanceof ITreeItemAxis);
+				Assert.isTrue(((ITreeItemAxis) current).getParent() == null);
+				axis.add((ITreeItemAxis) current);
+			}
+			doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, axis, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * 
+	 * This method does the wanted action according to the current selection of the table
+	 * 
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param axisProvider
+	 *            the table axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void doCollapseExpandActionOnSelection(CollapseAndExpandActionsEnum actionId, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		switch (actionId) {
+		case COLLAPSE_ALL_FROM_SELECTION:
+			collapseAllFromSelectedRows(axisProvider, natTable);
+			return;
+		case COLLAPSE_ONE_LEVEL:
+			collapseSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_TWO_LEVEL:
+			expandOn2LevelsSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_ALL_FROM_SELECTION:
+			expandAllFromSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_ONE_LEVEL:
+			expandFromSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_TO_NODE:
+			// nothing to do
+			return;
+		default:
+			return;
+		}
+	}
+
+	/**
+	 * 
+	 * This method does the wanted action according to the @param selectedRows
+	 * 
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param selectedRows
+	 *            the rows on which the action must be done
+	 * @param axisProvider
+	 *            the table axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedRows, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		switch (actionId) {
+		case COLLAPSE_ALL_FROM_SELECTION:
+			collapseAllRows(selectedRows, axisProvider, natTable);
+			break;
+		case COLLAPSE_ONE_LEVEL:
+			collapseRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_ALL_FROM_SELECTION:
+			expandAllRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_ONE_LEVEL:
+			expandRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_TO_NODE:
+			expandToRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_TWO_LEVEL:
+			expandOn2LevelsRows(selectedRows, axisProvider, natTable);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * This method allows to expand the selected rows on 2 levels
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandOn2LevelsRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();
+		for (ITreeItemAxis current : axis) {
+
+			toExpand.add(current);
+			if (!current.isExpanded() && current.getChildren().size() > 0) {
+				int index = axisProvider.getRowElementsList().indexOf(current);
+				if (index != -1) {
+					natTable.doCommand(new TreeExpandCollapseCommand(index));
+				}
+			}
+		}
+		for (ITreeItemAxis current : toExpand) {
+			for (ITreeItemAxis child : current.getChildren()) {
+				if (!child.isExpanded() && child.getChildren().size() > 0) {
+					int index = axisProvider.getRowElementsList().indexOf(child);
+					if (index != -1) {
+						natTable.doCommand(new TreeExpandCollapseCommand(index));
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 * @param axisProvider
+	 * @param natTable
+	 */
+	private static final void expandRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			if (!current.isExpanded()) {
+				int index = axisProvider.getRowElementsList().indexOf(current);
+				if (index != -1) {
+					natTable.doCommand(new TreeExpandCollapseCommand(index));
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 * @param axisProvider
+	 * @param natTable
+	 */
+	private static final void expandAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			expandFullBranch(current, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 * @param axisProvider
+	 * @param natTable
+	 */
+	private static final void collapseAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			if (current.isExpanded()) {
+				collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);
+			}
+		}
+	}
+
+	/**
+	 * @param axis
+	 *            the list of axis to collapse
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			int index = axisProvider.getRowElementsList().indexOf(axis);
+			if (index != -1 && current.isExpanded()) {
+				natTable.doCommand(new TreeExpandCollapseCommand(index));
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * This method expands parents of nodes to display these nodes in the table
+	 * 
+	 * @param axis
+	 *            a list of axis to show in the table
+	 * @param axisProvider
+	 *            an axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void expandToRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			expandToNode(current, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * This action expands the parents axis of the axis, in order to display it
+	 * 
+	 * @param axis
+	 *            an axis
+	 * @param axisProvider
+	 *            the axis provider of the table
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void expandToNode(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		List<ITreeItemAxis> axisToExpand = new ArrayList<ITreeItemAxis>();
+		ITreeItemAxis parent = axis.getParent();
+		while (parent != null) {
+			if (!parent.isExpanded()) {
+				axisToExpand.add(parent);
+			}
+			parent = parent.getParent();
+		}
+		for (ITreeItemAxis current : axisToExpand) {
+			int index = axisProvider.getRowElementsList().indexOf(current);
+			natTable.doCommand(new TreeExpandCollapseCommand(index));
+		}
+	}
+
+	/**
+	 * this method allows to collapse the selection
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				if (axis.isExpanded()) {
+					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));
+				}
+			}
+		}
+	}
+
+	/**
+	 * this method allows to expand the selection
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				if (!axis.isExpanded()) {
+					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));
+				}
+			}
+		}
+	}
+
+	/**
+	 * this method allows to collapse all nodes for the selection
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				if (axis.isExpanded()) {
+					collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 *            an axis
+	 *            this method collapse all ITreeItemAxis of the branch
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		// NatTable nattable = this.eventData.getNatTable();
+		if (axis.isExpanded() && axis.getChildren().size() > 0) {
+			int index = axisProvider.getRowElementsList().indexOf(axis);
+			for (ITreeItemAxis child : axis.getChildren()) {
+				collapseFullBranch(child, axisProvider, natTable);
+			}
+			natTable.doCommand(new TreeExpandCollapseCommand(index));
+		}
+	}
+
+	/**
+	 * This method allows to expand the selected rows on 2 levels
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandOn2LevelsSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				toExpand.add(axis);
+				if (!axis.isExpanded() && axis.getChildren().size() > 0) {
+					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));
+				}
+			}
+		}
+		for (ITreeItemAxis current : toExpand) {
+			for (ITreeItemAxis child : current.getChildren()) {
+				if (!child.isExpanded() && child.getChildren().size() > 0) {
+					int index = axisProvider.getRowElementsList().indexOf(child);
+					natTable.doCommand(new TreeExpandCollapseCommand(index));
+
+				}
+			}
+		}
+	}
+
+	/**
+	 * @return
+	 *         a map with the selected rows
+	 */
+	private static Map<Integer, Object> getFullySelectedRows() {
+		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();
+		if (selection instanceof TableStructuredSelection) {
+			TableStructuredSelection tableSelection = (TableStructuredSelection) selection;
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) tableSelection.getAdapter(TableSelectionWrapper.class);
+			return wrapper.getFullySelectedRows();
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * This method allows to expand all the sub-item of the selected items
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				expandFullBranch((ITreeItemAxis) value, axisProvider, natTable);
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            the axis for which we want to expand the whole branch
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		if (!axis.isExpanded() && axis.getChildren().size() > 0) {
+			int index = axisProvider.getRowElementsList().indexOf(axis);
+			natTable.doCommand(new TreeExpandCollapseCommand(index));
+			for (ITreeItemAxis child : axis.getChildren()) {
+				expandFullBranch(child, axisProvider, natTable);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java
index 4a98199bcea..3aa8933bff4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * 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

- *  Adapted code from EMF-Facet Nattable integration

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.widgets.Display;

-

-public final class DefaultSizeUtils {

-

-	private static final float MARGINE = 4;

-

-	private static final float FONT_CELL_RATIO = 2;

-

-	private static final float WIDTH_HEIGHT_RATIO = 8;

-

-	private static final float ROW_HEADER_RATIO = 6; // Row header width height ratio

-

-	private static final float DEFAULT_DPI = 96;

-

-	private DefaultSizeUtils() {

-		// Must not be used.

-	}

-

-	/**

-	 * windows : 150%

-	 * dipX=dpiY = 150

-	 * fontName = Segoe UI

-	 * fontHeight = 9

-	 * value = 33

-	 *

-	 * windows 125% :

-	 * dipX = dpiY = 120

-	 * fontName = Segoe UI

-	 * fontHeight = 9

-	 * value = 27,5

-	 *

-	 * windows 100%

-	 * dipX = dpiY = 96

-	 * fontName = Segoe UI

-	 * fontHeight = 9

-	 * value = 22

-	 *

-	 * @return

-	 *         the default cell height to use, according to the dpi used by the system

-	 */

-	public static int getDefaultCellHeight() {

-		float dpiY = Display.getDefault().getDPI().y;

-		FontData[] fd = Display.getDefault().getSystemFont().getFontData();

-		// fd[0].getName();

-		float height = (fd[0].getHeight() * DefaultSizeUtils.FONT_CELL_RATIO) + DefaultSizeUtils.MARGINE;

-		float value = height * (dpiY / DEFAULT_DPI);

-		return (int) Math.ceil(value);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the default cell width to use, according to the dpi used by the system

-	 */

-	public static int getDefaultCellWidth() {

-		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.WIDTH_HEIGHT_RATIO;

-		return (int) Math.ceil(width);

-	}

-

-	// not used

-	public static int getDefaultRowHeaderWidth() {

-		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.ROW_HEADER_RATIO;

-		return (int) Math.ceil(width);

-	}

-

-	// not used

-	public static Font getHeaderFont() {

-		FontData[] fd = Display.getDefault().getSystemFont().getFontData().clone();

-		fd[0].setStyle(SWT.BOLD);

-		Font headerFont = new Font(Display.getDefault(), fd);

-		return headerFont;

-	}

-}

+/*****************************************************************************
+ * 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
+ *  Adapted code from EMF-Facet Nattable integration
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Display;
+
+public final class DefaultSizeUtils {
+
+	private static final float MARGINE = 4;
+
+	private static final float FONT_CELL_RATIO = 2;
+
+	private static final float WIDTH_HEIGHT_RATIO = 8;
+
+	private static final float ROW_HEADER_RATIO = 6; // Row header width height ratio
+
+	private static final float DEFAULT_DPI = 96;
+
+	private DefaultSizeUtils() {
+		// Must not be used.
+	}
+
+	/**
+	 * windows : 150%
+	 * dipX=dpiY = 150
+	 * fontName = Segoe UI
+	 * fontHeight = 9
+	 * value = 33
+	 *
+	 * windows 125% :
+	 * dipX = dpiY = 120
+	 * fontName = Segoe UI
+	 * fontHeight = 9
+	 * value = 27,5
+	 *
+	 * windows 100%
+	 * dipX = dpiY = 96
+	 * fontName = Segoe UI
+	 * fontHeight = 9
+	 * value = 22
+	 *
+	 * @return
+	 *         the default cell height to use, according to the dpi used by the system
+	 */
+	public static int getDefaultCellHeight() {
+		float dpiY = Display.getDefault().getDPI().y;
+		FontData[] fd = Display.getDefault().getSystemFont().getFontData();
+		// fd[0].getName();
+		float height = (fd[0].getHeight() * DefaultSizeUtils.FONT_CELL_RATIO) + DefaultSizeUtils.MARGINE;
+		float value = height * (dpiY / DEFAULT_DPI);
+		return (int) Math.ceil(value);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the default cell width to use, according to the dpi used by the system
+	 */
+	public static int getDefaultCellWidth() {
+		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.WIDTH_HEIGHT_RATIO;
+		return (int) Math.ceil(width);
+	}
+
+	// not used
+	public static int getDefaultRowHeaderWidth() {
+		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.ROW_HEADER_RATIO;
+		return (int) Math.ceil(width);
+	}
+
+	// not used
+	public static Font getHeaderFont() {
+		FontData[] fd = Display.getDefault().getSystemFont().getFontData().clone();
+		fd[0].setStyle(SWT.BOLD);
+		Font headerFont = new Font(Display.getDefault(), fd);
+		return headerFont;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java
index 860ff80b5f7..894ab65ef4e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java
@@ -1,114 +1,114 @@
-/*****************************************************************************

- * 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.utils;

-

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- * @author Vincent Lorenzo

- *         This class provides methods to manipulate properly EventList calling appropriate lock and unlock methods

- */

-public class EventListHelper {

-

-	private EventListHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param list

-	 *            an event list to edit

-	 * @param object

-	 *            an object to add to the event list

-	 */

-	public static final void addToEventList(final EventList<Object> list, final Object object) {

-		list.getReadWriteLock().readLock().lock();

-		try {

-			if (list.contains(object)) {

-				return;

-			}

-		} catch (Exception e1) {

-			Activator.log.error(e1);

-		} finally {

-			list.getReadWriteLock().readLock().unlock();

-		}

-		int parentIndex = -1;

-		// 1. get the index to add the element

-		if (object instanceof ITreeItemAxis) {

-			IAxis parent = ((ITreeItemAxis) object).getParent();

-			if (parent != null) {

-				try {

-					list.getReadWriteLock().readLock().lock();

-					parentIndex = list.indexOf(parent);

-				} catch (Exception e) {

-					Activator.log.error(e);

-				} finally {

-					list.getReadWriteLock().readLock().unlock();

-				}

-			}

-		}

-

-

-		list.getReadWriteLock().writeLock().lock();

-		try {

-			if (parentIndex != -1) {

-				list.add(parentIndex + 1, object);

-			} else {

-				list.add(object);

-			}

-		} catch (Exception e) {

-			Activator.log.error(e);

-		} finally {

-			list.getReadWriteLock().writeLock().unlock();

-		}

-	}

-

-	/**

-	 *

-	 * @param list

-	 *            an event list to edit

-	 * @param object

-	 *            an object to remove from the list

-	 */

-	public static final void removeFromEventList(final EventList<Object> list, final Object object) {

-		list.getReadWriteLock().readLock().lock();

-		try {

-			if (!list.contains(object)) {

-				return;

-			}

-		} catch (Exception e1) {

-			Activator.log.error(e1);

-		} finally {

-			list.getReadWriteLock().readLock().unlock();

-		}

-

-		list.getReadWriteLock().writeLock().lock();

-		try {

-

-			if (object instanceof ITreeItemAxis) {

-				list.remove(object);

-			} else {

-				list.remove(object);

-			}

-		} catch (Exception e) {

-			Activator.log.error(e);

-		} finally {

-			list.getReadWriteLock().writeLock().unlock();

-		}

-	}

-}

+/*****************************************************************************
+ * 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.utils;
+
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ * @author Vincent Lorenzo
+ *         This class provides methods to manipulate properly EventList calling appropriate lock and unlock methods
+ */
+public class EventListHelper {
+
+	private EventListHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param list
+	 *            an event list to edit
+	 * @param object
+	 *            an object to add to the event list
+	 */
+	public static final void addToEventList(final EventList<Object> list, final Object object) {
+		list.getReadWriteLock().readLock().lock();
+		try {
+			if (list.contains(object)) {
+				return;
+			}
+		} catch (Exception e1) {
+			Activator.log.error(e1);
+		} finally {
+			list.getReadWriteLock().readLock().unlock();
+		}
+		int parentIndex = -1;
+		// 1. get the index to add the element
+		if (object instanceof ITreeItemAxis) {
+			IAxis parent = ((ITreeItemAxis) object).getParent();
+			if (parent != null) {
+				try {
+					list.getReadWriteLock().readLock().lock();
+					parentIndex = list.indexOf(parent);
+				} catch (Exception e) {
+					Activator.log.error(e);
+				} finally {
+					list.getReadWriteLock().readLock().unlock();
+				}
+			}
+		}
+
+
+		list.getReadWriteLock().writeLock().lock();
+		try {
+			if (parentIndex != -1) {
+				list.add(parentIndex + 1, object);
+			} else {
+				list.add(object);
+			}
+		} catch (Exception e) {
+			Activator.log.error(e);
+		} finally {
+			list.getReadWriteLock().writeLock().unlock();
+		}
+	}
+
+	/**
+	 *
+	 * @param list
+	 *            an event list to edit
+	 * @param object
+	 *            an object to remove from the list
+	 */
+	public static final void removeFromEventList(final EventList<Object> list, final Object object) {
+		list.getReadWriteLock().readLock().lock();
+		try {
+			if (!list.contains(object)) {
+				return;
+			}
+		} catch (Exception e1) {
+			Activator.log.error(e1);
+		} finally {
+			list.getReadWriteLock().readLock().unlock();
+		}
+
+		list.getReadWriteLock().writeLock().lock();
+		try {
+
+			if (object instanceof ITreeItemAxis) {
+				list.remove(object);
+			} else {
+				list.remove(object);
+			}
+		} catch (Exception e) {
+			Activator.log.error(e);
+		} finally {
+			list.getReadWriteLock().writeLock().unlock();
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
index 23d089f118d..409e796aca6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
@@ -1,435 +1,435 @@
-/*****************************************************************************

- * 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;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-import java.util.TreeSet;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-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.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- *

- * Util class used to get FillingConfigruation for the table

- *

- */

-public class FillingConfigurationUtils {

-

-

-	private FillingConfigurationUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * error message for developper

-	 */

-	private static final String INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE = "Invert axis not yet managed -> probably impossible with tree table"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param rep

-	 *            an axis manager representation

-	 * @param onColumn

-	 *            a boolean indicating than we are on column

-	 * @return

-	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager

-	 */

-	public static final List<TreeFillingConfiguration> getTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && local.getAxisManagerConfigurations().size() > 0) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				if (currentRep.getAxisManager() == representedAxisManager) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration) {

-							confs.add((TreeFillingConfiguration) current);

-						}

-					}

-					return confs;

-				}

-			}

-		} else {

-			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					confs.add((TreeFillingConfiguration) current);

-				}

-			}

-		}

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param rep

-	 *            an axis manager representation

-	 * @return

-	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager defined as column axis manager

-	 * @since 4.0

-	 */

-	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForColumn(final Table table, final AxisManagerRepresentation representedAxisManager) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalColumnHeaderAxisConfiguration();

-		if (local != null && local.getAxisManagerConfigurations().size() > 0) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				if (currentRep.getAxisManager() == representedAxisManager) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration) {

-							confs.add((TreeFillingConfiguration) current);

-						}

-					}

-					return confs;

-				}

-			}

-		} else {

-			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					confs.add((TreeFillingConfiguration) current);

-				}

-			}

-		}

-		return confs;

-	}

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param wantedDepth

-	 *            the depth for which we want all TreeFillingConfiguration

-	 * @return

-	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager

-	 */

-	public static final List<TreeFillingConfiguration> getAllTreeFillingConfigurationForDepth(final Table table, final int wantedDepth) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && local.getAxisManagerConfigurations().size() > 0) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {

-							confs.add((TreeFillingConfiguration) current);

-						}

-					}

-				}

-				return confs;

-			}

-

-		}

-

-		TableHeaderAxisConfiguration rowConfig = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		List<AxisManagerRepresentation> axisManagers = rowConfig.getAxisManagers();

-		for (AxisManagerRepresentation axisManagerRepresentation : axisManagers) {

-			for (IAxisConfiguration current : axisManagerRepresentation.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {

-						confs.add((TreeFillingConfiguration) current);

-					}

-				}

-			}

-		}

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         all {@link TreeFillingConfiguration} used in the table

-	 */

-	public static final List<TreeFillingConfiguration> getAllTreeFillingConfiguration(final Table table) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) { //bug 467968: [Tree Table] Show Hide categories menu is not displayed after changing categories

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						confs.add((TreeFillingConfiguration) current);

-					}

-				}

-			}

-		} else {

-			for (AxisManagerRepresentation axisManager : table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers()) {

-				for (IAxisConfiguration axisConf : axisManager.getSpecificAxisConfigurations()) {

-					if (axisConf instanceof TreeFillingConfiguration) {

-						confs.add((TreeFillingConfiguration) axisConf);

-					}

-				}

-			}

-		}

-		return confs;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param representedAxisManager

-	 *            the represented axis manager for which we want TreeFillingConfiguration

-	 * @param depth

-	 *            the depth for which we want tree filling configuration

-	 * @return

-	 *         <code>true</code> is the representedAxisManager has TreeFillingConfiguration

-	 *

-	 */

-	public static final boolean hasTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				if (currentRep.getAxisManager() == representedAxisManager) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration) {

-							return true;

-						}

-					}

-				}

-			}

-		} else {

-			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param representedAxisManager

-	 *            the represented axis manager for which we want TreeFillingConfiguration

-	 * @param depth

-	 *            the depth for which we want tree filling configuration

-	 * @return

-	 *         a list of @link TreeFillingConfiguration} for the wanted depth

-	 *

-	 */

-	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {

-		// duplicate code getTreeFillingConfiguration to avoid to iterate twice on the same list

-		List<TreeFillingConfiguration> confs = getTreeFillingConfiguration(table, representedAxisManager);

-		Iterator<TreeFillingConfiguration> iter = confs.listIterator();

-		while (iter.hasNext()) {

-			if (iter.next().getDepth() != depth) {

-				iter.remove();

-			}

-		}

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param representedAxisManager

-	 *            the represented axis manager for which we want TreeFillingConfiguration

-	 * @param depth

-	 *            the depth for which we want tree filling configuration

-	 * @return

-	 *         <code>true</code> if we found {@link TreeFillingConfiguration} for the wanted depth

-	 *

-	 */

-	public static final boolean hasTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {

-		Iterator<TreeFillingConfiguration> iter = getTreeFillingConfigurationForDepth(table, representedAxisManager, depth).iterator();

-		while (iter.hasNext()) {

-			if (iter.next().getDepth() == depth) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param onColumn

-	 *            <code>true</code> if the user is working on column and false if not

-	 * @return

-	 *         the list of the filling configuration used by the table

-	 */

-	// TODO : doesn't yet manage the local filling configuration

-	public static final Collection<IFillingConfiguration> getFillingConfigurationUsedInTable(final Table table, final boolean onColumn) {

-		final Collection<IFillingConfiguration> confs = new ArrayList<IFillingConfiguration>();

-

-

-		AbstractHeaderAxisConfiguration tableHeaderAxisConfiguration;

-		if (onColumn) {

-			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-		} else {

-			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		}

-

-		for (final IAxisConfiguration currentConfiguration : tableHeaderAxisConfiguration.getOwnedAxisConfigurations()) {

-			if (currentConfiguration instanceof IFillingConfiguration) {

-				confs.add((IFillingConfiguration) currentConfiguration);

-			}

-		}

-

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param onColumn

-	 *            true if we are working on column

-	 * @return

-	 *         the element type id to create or <code>null</code> if not found

-	 */

-	public static String getElementTypeIdToCreate(final Table table, final boolean onColumn) {

-		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);

-		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {

-			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {

-				return ((PasteEObjectConfiguration) fillingConfiguration).getPastedElementId();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param onColumn

-	 *            true if we are working on column

-	 * @return

-	 *         the containment feature to use for created element

-	 */

-	public static EStructuralFeature getContainmentFeature(final Table table, final boolean onColumn) {

-		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);

-		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {

-			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {

-				return ((PasteEObjectConfiguration) fillingConfiguration).getPasteElementContainementFeature();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param depth

-	 *            a wanted depth

-	 * @return

-	 *         <code>true</code> if the table has tree filling configuration declared on the wanted depth

-	 */

-	public static boolean hasTreeFillingConfigurationForDepth(final Table table, final int depth) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null) {

-			List<AxisManagerConfiguration> localReps = local.getAxisManagerConfigurations();

-			if (!localReps.isEmpty()) {

-				for (AxisManagerConfiguration currentRep : localReps) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {

-							return true;

-						}

-					}

-				}

-				return false;

-			}

-		}

-		final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();

-		for (final AxisManagerRepresentation currentRep : representation) {

-			for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {

-					return true;

-				}

-			}

-

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the maximum depth displayed in the table. This method check than all hidden depth are consecutive and start to 0 (or 1)

-	 */

-	public static int getMaxDepthForTree(final Table table) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		TreeSet<Integer> hiddenLevels = new TreeSet<Integer>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						int depth = ((TreeFillingConfiguration) current).getDepth();

-						if (depth >= 0) {

-							hiddenLevels.add(Integer.valueOf(depth));

-						}

-					}

-				}

-			}

-		} else {

-			final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();

-			for (final AxisManagerRepresentation currentRep : representation) {

-				for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						int depth = ((TreeFillingConfiguration) current).getDepth();

-						if (depth >= 0) {

-							hiddenLevels.add(Integer.valueOf(depth));

-						}

-					}

-				}

-			}

-		}

-		if (hiddenLevels.size() > 0) {

-			Iterator<Integer> iter = hiddenLevels.iterator();

-			int previousValue = iter.next().intValue();

-			if (previousValue == 0 || previousValue == 1) {

-				while (iter.hasNext()) {

-					int nextValue = iter.next();

-					if (nextValue == previousValue + 1) {

-						previousValue = nextValue;

-					} else {

-						return previousValue;

-					}

-				}

-				return previousValue;

-			}

-

-		}

-		return 0;

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+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.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ *
+ * Util class used to get FillingConfigruation for the table
+ *
+ */
+public class FillingConfigurationUtils {
+
+
+	private FillingConfigurationUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * error message for developper
+	 */
+	private static final String INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE = "Invert axis not yet managed -> probably impossible with tree table"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param rep
+	 *            an axis manager representation
+	 * @param onColumn
+	 *            a boolean indicating than we are on column
+	 * @return
+	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager
+	 */
+	public static final List<TreeFillingConfiguration> getTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && local.getAxisManagerConfigurations().size() > 0) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				if (currentRep.getAxisManager() == representedAxisManager) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration) {
+							confs.add((TreeFillingConfiguration) current);
+						}
+					}
+					return confs;
+				}
+			}
+		} else {
+			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					confs.add((TreeFillingConfiguration) current);
+				}
+			}
+		}
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param rep
+	 *            an axis manager representation
+	 * @return
+	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager defined as column axis manager
+	 * @since 4.0
+	 */
+	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForColumn(final Table table, final AxisManagerRepresentation representedAxisManager) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalColumnHeaderAxisConfiguration();
+		if (local != null && local.getAxisManagerConfigurations().size() > 0) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				if (currentRep.getAxisManager() == representedAxisManager) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration) {
+							confs.add((TreeFillingConfiguration) current);
+						}
+					}
+					return confs;
+				}
+			}
+		} else {
+			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					confs.add((TreeFillingConfiguration) current);
+				}
+			}
+		}
+		return confs;
+	}
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param wantedDepth
+	 *            the depth for which we want all TreeFillingConfiguration
+	 * @return
+	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager
+	 */
+	public static final List<TreeFillingConfiguration> getAllTreeFillingConfigurationForDepth(final Table table, final int wantedDepth) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && local.getAxisManagerConfigurations().size() > 0) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {
+							confs.add((TreeFillingConfiguration) current);
+						}
+					}
+				}
+				return confs;
+			}
+
+		}
+
+		TableHeaderAxisConfiguration rowConfig = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		List<AxisManagerRepresentation> axisManagers = rowConfig.getAxisManagers();
+		for (AxisManagerRepresentation axisManagerRepresentation : axisManagers) {
+			for (IAxisConfiguration current : axisManagerRepresentation.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {
+						confs.add((TreeFillingConfiguration) current);
+					}
+				}
+			}
+		}
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         all {@link TreeFillingConfiguration} used in the table
+	 */
+	public static final List<TreeFillingConfiguration> getAllTreeFillingConfiguration(final Table table) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) { //bug 467968: [Tree Table] Show Hide categories menu is not displayed after changing categories
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						confs.add((TreeFillingConfiguration) current);
+					}
+				}
+			}
+		} else {
+			for (AxisManagerRepresentation axisManager : table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers()) {
+				for (IAxisConfiguration axisConf : axisManager.getSpecificAxisConfigurations()) {
+					if (axisConf instanceof TreeFillingConfiguration) {
+						confs.add((TreeFillingConfiguration) axisConf);
+					}
+				}
+			}
+		}
+		return confs;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param representedAxisManager
+	 *            the represented axis manager for which we want TreeFillingConfiguration
+	 * @param depth
+	 *            the depth for which we want tree filling configuration
+	 * @return
+	 *         <code>true</code> is the representedAxisManager has TreeFillingConfiguration
+	 *
+	 */
+	public static final boolean hasTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				if (currentRep.getAxisManager() == representedAxisManager) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration) {
+							return true;
+						}
+					}
+				}
+			}
+		} else {
+			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param representedAxisManager
+	 *            the represented axis manager for which we want TreeFillingConfiguration
+	 * @param depth
+	 *            the depth for which we want tree filling configuration
+	 * @return
+	 *         a list of @link TreeFillingConfiguration} for the wanted depth
+	 *
+	 */
+	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {
+		// duplicate code getTreeFillingConfiguration to avoid to iterate twice on the same list
+		List<TreeFillingConfiguration> confs = getTreeFillingConfiguration(table, representedAxisManager);
+		Iterator<TreeFillingConfiguration> iter = confs.listIterator();
+		while (iter.hasNext()) {
+			if (iter.next().getDepth() != depth) {
+				iter.remove();
+			}
+		}
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param representedAxisManager
+	 *            the represented axis manager for which we want TreeFillingConfiguration
+	 * @param depth
+	 *            the depth for which we want tree filling configuration
+	 * @return
+	 *         <code>true</code> if we found {@link TreeFillingConfiguration} for the wanted depth
+	 *
+	 */
+	public static final boolean hasTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {
+		Iterator<TreeFillingConfiguration> iter = getTreeFillingConfigurationForDepth(table, representedAxisManager, depth).iterator();
+		while (iter.hasNext()) {
+			if (iter.next().getDepth() == depth) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param onColumn
+	 *            <code>true</code> if the user is working on column and false if not
+	 * @return
+	 *         the list of the filling configuration used by the table
+	 */
+	// TODO : doesn't yet manage the local filling configuration
+	public static final Collection<IFillingConfiguration> getFillingConfigurationUsedInTable(final Table table, final boolean onColumn) {
+		final Collection<IFillingConfiguration> confs = new ArrayList<IFillingConfiguration>();
+
+
+		AbstractHeaderAxisConfiguration tableHeaderAxisConfiguration;
+		if (onColumn) {
+			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+		} else {
+			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+		}
+
+		for (final IAxisConfiguration currentConfiguration : tableHeaderAxisConfiguration.getOwnedAxisConfigurations()) {
+			if (currentConfiguration instanceof IFillingConfiguration) {
+				confs.add((IFillingConfiguration) currentConfiguration);
+			}
+		}
+
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param onColumn
+	 *            true if we are working on column
+	 * @return
+	 *         the element type id to create or <code>null</code> if not found
+	 */
+	public static String getElementTypeIdToCreate(final Table table, final boolean onColumn) {
+		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);
+		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {
+			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {
+				return ((PasteEObjectConfiguration) fillingConfiguration).getPastedElementId();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param onColumn
+	 *            true if we are working on column
+	 * @return
+	 *         the containment feature to use for created element
+	 */
+	public static EStructuralFeature getContainmentFeature(final Table table, final boolean onColumn) {
+		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);
+		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {
+			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {
+				return ((PasteEObjectConfiguration) fillingConfiguration).getPasteElementContainementFeature();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param depth
+	 *            a wanted depth
+	 * @return
+	 *         <code>true</code> if the table has tree filling configuration declared on the wanted depth
+	 */
+	public static boolean hasTreeFillingConfigurationForDepth(final Table table, final int depth) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null) {
+			List<AxisManagerConfiguration> localReps = local.getAxisManagerConfigurations();
+			if (!localReps.isEmpty()) {
+				for (AxisManagerConfiguration currentRep : localReps) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();
+		for (final AxisManagerRepresentation currentRep : representation) {
+			for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {
+					return true;
+				}
+			}
+
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the maximum depth displayed in the table. This method check than all hidden depth are consecutive and start to 0 (or 1)
+	 */
+	public static int getMaxDepthForTree(final Table table) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		TreeSet<Integer> hiddenLevels = new TreeSet<Integer>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						int depth = ((TreeFillingConfiguration) current).getDepth();
+						if (depth >= 0) {
+							hiddenLevels.add(Integer.valueOf(depth));
+						}
+					}
+				}
+			}
+		} else {
+			final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();
+			for (final AxisManagerRepresentation currentRep : representation) {
+				for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						int depth = ((TreeFillingConfiguration) current).getDepth();
+						if (depth >= 0) {
+							hiddenLevels.add(Integer.valueOf(depth));
+						}
+					}
+				}
+			}
+		}
+		if (hiddenLevels.size() > 0) {
+			Iterator<Integer> iter = hiddenLevels.iterator();
+			int previousValue = iter.next().intValue();
+			if (previousValue == 0 || previousValue == 1) {
+				while (iter.hasNext()) {
+					int nextValue = iter.next();
+					if (nextValue == previousValue + 1) {
+						previousValue = nextValue;
+					} else {
+						return previousValue;
+					}
+				}
+				return previousValue;
+			}
+
+		}
+		return 0;
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
index 7b47f84626b..d38de45903d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
@@ -1,206 +1,206 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-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.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-

-/**

- * Utils class for AxisConfiguration

- *

- * @author Vincent Lorenzo

- *

- */

-public class HeaderAxisConfigurationManagementUtils {

-

-	private HeaderAxisConfigurationManagementUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the table and used for rows, managing the inversion of the axis or <code>null</code> if we aer

-	 *         using the

-	 *         configuration defined in the table configuration

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the tableconfiguration for rows, managing the inversion of the axis. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		assert config != null;

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 * 		the header configuration used for rows in the table. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisConfigurationUsedInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);

-		if (config == null) {

-			config = getRowAbstractHeaderAxisInTableConfiguration(table);

-		}

-		assert config != null;

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the table and used for columns, managing the inversion of the axis or <code>null</code> if we are

-	 *         using the configuration defined in the table configuration

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalColumnHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalRowHeaderAxisConfiguration();

-		}

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the tableconfiguration for columns, mananing the inversion of the axis. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		}

-		assert config != null;

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 * 		the header configuration used for columns in the table. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisConfigurationUsedInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = getColumnAbstractHeaderAxisInTable(table);

-		if (config == null) {

-			config = getColumnAbstractHeaderAxisInTableConfiguration(table);

-		}

-		Assert.isNotNull(config);

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 * 		the header configuration used for row in the table. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisUsedInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);

-		if (config == null) {

-			config = getRowAbstractHeaderAxisInTableConfiguration(table);

-		}

-		Assert.isNotNull(config);

-		return config;

-	}

-

-	/**

-	 *

-	 * @param configuration

-	 *            the configuration to duplicate

-	 * @return

-	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}

-	 */

-	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfiguration(final TableHeaderAxisConfiguration configuration) {

-		LocalTableHeaderAxisConfiguration conf = NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration();

-		conf.setDisplayFilter(configuration.isDisplayFilter());

-		conf.setDisplayIndex(configuration.isDisplayIndex());

-		conf.setDisplayLabel(configuration.isDisplayLabel());

-		conf.setIndexStyle(configuration.getIndexStyle());

-		for (Style current : configuration.getStyles()) {

-			Style copy = EcoreUtil.copy(current);

-			conf.getStyles().add(copy);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param configuration

-	 *            the configuration to duplicate, with all its configuration

-	 * @return

-	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}

-	 * @since 3.0

-	 */

-	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfigurationIncludingAllConfigurations(final TableHeaderAxisConfiguration configuration) {

-		final LocalTableHeaderAxisConfiguration conf = transformToLocalHeaderConfiguration(configuration);

-		for (final AxisManagerRepresentation axisManagers : configuration.getAxisManagers()) {

-			final AxisManagerConfiguration currentConfiguration = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();

-			currentConfiguration.setAxisManager(axisManagers);

-			for (final Style current : axisManagers.getStyles()) {

-				Style copy = EcoreUtil.copy(current);

-				axisManagers.getStyles().add(copy);

-			}

-

-			for (final IAxisConfiguration axisConf : axisManagers.getSpecificAxisConfigurations()) {

-				final IAxisConfiguration tmp = EcoreUtil.copy(axisConf);

-				conf.getOwnedAxisConfigurations().add(tmp);

-				currentConfiguration.getLocalSpecificConfigurations().add(tmp);

-			}

-			final ILabelProviderConfiguration labelProviderConfiguration = EcoreUtil.copy(axisManagers.getHeaderLabelConfiguration());

-			currentConfiguration.setLocalHeaderLabelConfiguration(labelProviderConfiguration);

-			conf.getOwnedLabelConfigurations().add(labelProviderConfiguration);

-			conf.getAxisManagerConfigurations().add(currentConfiguration);

-

-		}

-		return conf;

-	}

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+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.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+
+/**
+ * Utils class for AxisConfiguration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HeaderAxisConfigurationManagementUtils {
+
+	private HeaderAxisConfigurationManagementUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the table and used for rows, managing the inversion of the axis or <code>null</code> if we aer
+	 *         using the
+	 *         configuration defined in the table configuration
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the tableconfiguration for rows, managing the inversion of the axis. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		assert config != null;
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the header configuration used for rows in the table. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisConfigurationUsedInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);
+		if (config == null) {
+			config = getRowAbstractHeaderAxisInTableConfiguration(table);
+		}
+		assert config != null;
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the table and used for columns, managing the inversion of the axis or <code>null</code> if we are
+	 *         using the configuration defined in the table configuration
+	 */
+	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalColumnHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalRowHeaderAxisConfiguration();
+		}
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the tableconfiguration for columns, mananing the inversion of the axis. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		}
+		assert config != null;
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the header configuration used for columns in the table. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisConfigurationUsedInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = getColumnAbstractHeaderAxisInTable(table);
+		if (config == null) {
+			config = getColumnAbstractHeaderAxisInTableConfiguration(table);
+		}
+		Assert.isNotNull(config);
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the header configuration used for row in the table. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisUsedInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);
+		if (config == null) {
+			config = getRowAbstractHeaderAxisInTableConfiguration(table);
+		}
+		Assert.isNotNull(config);
+		return config;
+	}
+
+	/**
+	 *
+	 * @param configuration
+	 *            the configuration to duplicate
+	 * @return
+	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}
+	 */
+	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfiguration(final TableHeaderAxisConfiguration configuration) {
+		LocalTableHeaderAxisConfiguration conf = NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration();
+		conf.setDisplayFilter(configuration.isDisplayFilter());
+		conf.setDisplayIndex(configuration.isDisplayIndex());
+		conf.setDisplayLabel(configuration.isDisplayLabel());
+		conf.setIndexStyle(configuration.getIndexStyle());
+		for (Style current : configuration.getStyles()) {
+			Style copy = EcoreUtil.copy(current);
+			conf.getStyles().add(copy);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param configuration
+	 *            the configuration to duplicate, with all its configuration
+	 * @return
+	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}
+	 * @since 3.0
+	 */
+	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfigurationIncludingAllConfigurations(final TableHeaderAxisConfiguration configuration) {
+		final LocalTableHeaderAxisConfiguration conf = transformToLocalHeaderConfiguration(configuration);
+		for (final AxisManagerRepresentation axisManagers : configuration.getAxisManagers()) {
+			final AxisManagerConfiguration currentConfiguration = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();
+			currentConfiguration.setAxisManager(axisManagers);
+			for (final Style current : axisManagers.getStyles()) {
+				Style copy = EcoreUtil.copy(current);
+				axisManagers.getStyles().add(copy);
+			}
+
+			for (final IAxisConfiguration axisConf : axisManagers.getSpecificAxisConfigurations()) {
+				final IAxisConfiguration tmp = EcoreUtil.copy(axisConf);
+				conf.getOwnedAxisConfigurations().add(tmp);
+				currentConfiguration.getLocalSpecificConfigurations().add(tmp);
+			}
+			final ILabelProviderConfiguration labelProviderConfiguration = EcoreUtil.copy(axisManagers.getHeaderLabelConfiguration());
+			currentConfiguration.setLocalHeaderLabelConfiguration(labelProviderConfiguration);
+			conf.getOwnedLabelConfigurations().add(labelProviderConfiguration);
+			conf.getAxisManagerConfigurations().add(currentConfiguration);
+
+		}
+		return conf;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
index 1f7f91c9311..43c4e88c15b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
@@ -1,28 +1,28 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-

-

-/**

- * This interface provides specific methods to allows to get a label with its context (object and edited feature)

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ILabelProviderCellContextElementWrapper extends ILabelProviderContextElementWrapper, ILayerCell {

-

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+
+
+/**
+ * This interface provides specific methods to allows to get a label with its context (object and edited feature)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ILabelProviderCellContextElementWrapper extends ILabelProviderContextElementWrapper, ILayerCell {
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
index de58ea076cf..f7811a5c667 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-

-

-/**

- * This interface provides specific methods to allows to get a label with its context (object and edited feature)

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ILabelProviderContextElementWrapper {

-

-	/**

-	 *

-	 * @return

-	 *         the config registry which can provide useful information

-	 */

-	public IConfigRegistry getConfigRegistry();

-

-	/**

-	 *

-	 * @return

-	 *         the object for which we want the label

-	 */

-	public Object getObject();

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+
+
+/**
+ * This interface provides specific methods to allows to get a label with its context (object and edited feature)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ILabelProviderContextElementWrapper {
+
+	/**
+	 *
+	 * @return
+	 *         the config registry which can provide useful information
+	 */
+	public IConfigRegistry getConfigRegistry();
+
+	/**
+	 *
+	 * @return
+	 *         the object for which we want the label
+	 */
+	public Object getObject();
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java
index 6d5994ac411..8c9815bda11 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * Utilities for INattableModelManager

- *

- * @author Vincent Lorenzo

- *

- */

-public class INattableModelManagerUtils {

-

-

-	private INattableModelManagerUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 *

-	 * @param activeWorkbenchPart

-	 * @return

-	 *         the table manager from the workbench part

-	 */

-	public static INattableModelManager getTableManagerFromWorkbenchPart(final IWorkbenchPart activeWorkbenchPart) {

-		if (activeWorkbenchPart != null) {

-			return (INattableModelManager) activeWorkbenchPart.getAdapter(INattableModelManager.class);

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * Utilities for INattableModelManager
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class INattableModelManagerUtils {
+
+
+	private INattableModelManagerUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 *
+	 * @param activeWorkbenchPart
+	 * @return
+	 *         the table manager from the workbench part
+	 */
+	public static INattableModelManager getTableManagerFromWorkbenchPart(final IWorkbenchPart activeWorkbenchPart) {
+		if (activeWorkbenchPart != null) {
+			return (INattableModelManager) activeWorkbenchPart.getAdapter(INattableModelManager.class);
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
index 8be4f01142e..2d945a8032e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
@@ -1,310 +1,310 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-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;

-

-/**

- * Utils class for LabelConfiguration management

- *

- * @author Vincent Lorenzo

- *

- */

-public class LabelConfigurationManagementUtils {

-

-	private LabelConfigurationManagementUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof FeatureLabelProviderConfiguration) {

-					return (FeatureLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof FeatureLabelProviderConfiguration) {

-				return (FeatureLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasRowFeatureLabelConfiguration(final Table table) {

-		return getRowFeatureLabelConfigurationInTable(table) != null || getRowFeatureLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof FeatureLabelProviderConfiguration) {

-					return (FeatureLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof FeatureLabelProviderConfiguration) {

-				return (FeatureLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasColumnFeatureLabelConfiguration(final Table table) {

-		return getColumnFeatureLabelConfigurationInTable(table) != null || getColumnFeatureLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof ObjectLabelProviderConfiguration) {

-					return (ObjectLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof ObjectLabelProviderConfiguration) {

-				return (ObjectLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasRowObjectLabelConfiguration(final Table table) {

-		return getRowObjectLabelConfigurationInTable(table) != null || getRowObjectLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof ObjectLabelProviderConfiguration) {

-					return (ObjectLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof ObjectLabelProviderConfiguration) {

-				return (ObjectLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasColumnObjectLabelConfiguration(final Table table) {

-		return getColumnObjectLabelConfigurationInTable(table) != null || getColumnObjectLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final FeatureLabelProviderConfiguration getUsedColumnFeatureLabelConfiguration(final Table table) {

-		FeatureLabelProviderConfiguration conf = getColumnFeatureLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getColumnFeatureLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final FeatureLabelProviderConfiguration getUsedRowFeatureLabelConfiguration(final Table table) {

-		FeatureLabelProviderConfiguration conf = getRowFeatureLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getRowFeatureLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final ObjectLabelProviderConfiguration getUsedColumnObjectLabelConfiguration(final Table table) {

-		ObjectLabelProviderConfiguration conf = getColumnObjectLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getColumnObjectLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final ObjectLabelProviderConfiguration getUsedRowObjectLabelConfiguration(final Table table) {

-		ObjectLabelProviderConfiguration conf = getRowObjectLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getRowObjectLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+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;
+
+/**
+ * Utils class for LabelConfiguration management
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class LabelConfigurationManagementUtils {
+
+	private LabelConfigurationManagementUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof FeatureLabelProviderConfiguration) {
+					return (FeatureLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof FeatureLabelProviderConfiguration) {
+				return (FeatureLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasRowFeatureLabelConfiguration(final Table table) {
+		return getRowFeatureLabelConfigurationInTable(table) != null || getRowFeatureLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof FeatureLabelProviderConfiguration) {
+					return (FeatureLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof FeatureLabelProviderConfiguration) {
+				return (FeatureLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasColumnFeatureLabelConfiguration(final Table table) {
+		return getColumnFeatureLabelConfigurationInTable(table) != null || getColumnFeatureLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof ObjectLabelProviderConfiguration) {
+					return (ObjectLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof ObjectLabelProviderConfiguration) {
+				return (ObjectLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasRowObjectLabelConfiguration(final Table table) {
+		return getRowObjectLabelConfigurationInTable(table) != null || getRowObjectLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof ObjectLabelProviderConfiguration) {
+					return (ObjectLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof ObjectLabelProviderConfiguration) {
+				return (ObjectLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasColumnObjectLabelConfiguration(final Table table) {
+		return getColumnObjectLabelConfigurationInTable(table) != null || getColumnObjectLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final FeatureLabelProviderConfiguration getUsedColumnFeatureLabelConfiguration(final Table table) {
+		FeatureLabelProviderConfiguration conf = getColumnFeatureLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getColumnFeatureLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final FeatureLabelProviderConfiguration getUsedRowFeatureLabelConfiguration(final Table table) {
+		FeatureLabelProviderConfiguration conf = getRowFeatureLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getRowFeatureLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final ObjectLabelProviderConfiguration getUsedColumnObjectLabelConfiguration(final Table table) {
+		ObjectLabelProviderConfiguration conf = getColumnObjectLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getColumnObjectLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final ObjectLabelProviderConfiguration getUsedRowObjectLabelConfiguration(final Table table) {
+		ObjectLabelProviderConfiguration conf = getRowObjectLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getRowObjectLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
index aba49032084..bfa4470aa46 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
@@ -1,243 +1,243 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * This object can used as context to find the best label provider and get the text to display.

- * Its allows to have the context of the value to use it in the label provider

- *

- * This objects can be used to get the label of an object which is not the current value of the cell, using the label provider used by the cell.

- * example to get the value of the enumeration literal in the combo box for uml stereotype properties

- *

- * @author Vincent Lorenzo

- *

- */

-

-public class LabelProviderCellContextElementWrapper extends LabelProviderContextElementWrapper implements ILabelProviderCellContextElementWrapper {

-

-	/** the cell. */

-	private ILayerCell cell;

-

-	/**

-	 * *

-	 * Constructor.

-	 *

-	 * @param cell

-	 *            the cell for which we want the label/icon, ...

-	 * @param registry

-	 *            the registry used by nattable

-	 * @deprecated since Eclipse Mars, please use setter method

-	 */

-	@Deprecated

-	public LabelProviderCellContextElementWrapper(ILayerCell cell, final IConfigRegistry registry) {

-		this(cell, cell.getDataValue(), registry);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 */

-	public LabelProviderCellContextElementWrapper() {

-		super();

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 *            the wrapped cell

-	 */

-	public void setCell(ILayerCell cell) {

-		this.cell = cell;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param cell

-	 *            the cell

-	 * @param value

-	 *            a value

-	 * @param registry

-	 *            the registry used by nattable

-	 * @deprecated use setter instead of this constructor

-	 */

-	@Deprecated

-	public LabelProviderCellContextElementWrapper(ILayerCell cell, final Object value, final IConfigRegistry registry) {

-		super(value, registry);

-		this.cell = cell;

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getConfigLabels()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public LabelStack getConfigLabels() {

-		return this.cell.getConfigLabels();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginColumnPosition()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getOriginColumnPosition() {

-		return cell.getOriginColumnPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginRowPosition()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getOriginRowPosition() {

-		return cell.getOriginRowPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getLayer()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public ILayer getLayer() {

-		return cell.getLayer();

-	}

-

-	/**

-	 * Gets the column position.

-	 *

-	 * @return the column position

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnPosition()

-	 */

-

-	@Override

-	public int getColumnPosition() {

-		return cell.getColumnPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowPosition()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getRowPosition() {

-		return cell.getRowPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnIndex()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getColumnIndex() {

-		return cell.getColumnIndex();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowIndex()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getRowIndex() {

-		return cell.getRowIndex();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnSpan()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getColumnSpan() {

-		return cell.getColumnSpan();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowSpan()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getRowSpan() {

-		return cell.getRowSpan();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#isSpannedCell()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public boolean isSpannedCell() {

-		return cell.isSpannedCell();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDisplayMode()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public String getDisplayMode() {

-		return cell.getDisplayMode();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDataValue()

-	 *

-	 * @return

-	 */

-	@Override

-	public final Object getDataValue() {

-		throw new UnsupportedOperationException("You must use ILabelProviderCellContextElement#getObject()"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getBounds()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Rectangle getBounds() {

-		return cell.getBounds();

-	}

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This object can used as context to find the best label provider and get the text to display.
+ * Its allows to have the context of the value to use it in the label provider
+ *
+ * This objects can be used to get the label of an object which is not the current value of the cell, using the label provider used by the cell.
+ * example to get the value of the enumeration literal in the combo box for uml stereotype properties
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+
+public class LabelProviderCellContextElementWrapper extends LabelProviderContextElementWrapper implements ILabelProviderCellContextElementWrapper {
+
+	/** the cell. */
+	private ILayerCell cell;
+
+	/**
+	 * *
+	 * Constructor.
+	 *
+	 * @param cell
+	 *            the cell for which we want the label/icon, ...
+	 * @param registry
+	 *            the registry used by nattable
+	 * @deprecated since Eclipse Mars, please use setter method
+	 */
+	@Deprecated
+	public LabelProviderCellContextElementWrapper(ILayerCell cell, final IConfigRegistry registry) {
+		this(cell, cell.getDataValue(), registry);
+	}
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 */
+	public LabelProviderCellContextElementWrapper() {
+		super();
+	}
+
+	/**
+	 * 
+	 * @param cell
+	 *            the wrapped cell
+	 */
+	public void setCell(ILayerCell cell) {
+		this.cell = cell;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param cell
+	 *            the cell
+	 * @param value
+	 *            a value
+	 * @param registry
+	 *            the registry used by nattable
+	 * @deprecated use setter instead of this constructor
+	 */
+	@Deprecated
+	public LabelProviderCellContextElementWrapper(ILayerCell cell, final Object value, final IConfigRegistry registry) {
+		super(value, registry);
+		this.cell = cell;
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getConfigLabels()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public LabelStack getConfigLabels() {
+		return this.cell.getConfigLabels();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginColumnPosition()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getOriginColumnPosition() {
+		return cell.getOriginColumnPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginRowPosition()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getOriginRowPosition() {
+		return cell.getOriginRowPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getLayer()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public ILayer getLayer() {
+		return cell.getLayer();
+	}
+
+	/**
+	 * Gets the column position.
+	 *
+	 * @return the column position
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnPosition()
+	 */
+
+	@Override
+	public int getColumnPosition() {
+		return cell.getColumnPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowPosition()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getRowPosition() {
+		return cell.getRowPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnIndex()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getColumnIndex() {
+		return cell.getColumnIndex();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowIndex()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getRowIndex() {
+		return cell.getRowIndex();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnSpan()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getColumnSpan() {
+		return cell.getColumnSpan();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowSpan()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getRowSpan() {
+		return cell.getRowSpan();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#isSpannedCell()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public boolean isSpannedCell() {
+		return cell.isSpannedCell();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDisplayMode()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public String getDisplayMode() {
+		return cell.getDisplayMode();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDataValue()
+	 *
+	 * @return
+	 */
+	@Override
+	public final Object getDataValue() {
+		throw new UnsupportedOperationException("You must use ILabelProviderCellContextElement#getObject()"); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getBounds()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Rectangle getBounds() {
+		return cell.getBounds();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
index 57678ee40db..1fbbc8dddfb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
@@ -1,103 +1,103 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-

-/**

- * This object can used as context to find the best label provider and get the text to display.

- * Its allows to have the context of the value to use it in the label provider

- *

- * @author Vincent Lorenzo

- *

- */

-public class LabelProviderContextElementWrapper implements ILabelProviderContextElementWrapper {

-

-	/**

-	 * the config registry of the table

-	 */

-	private IConfigRegistry registry;

-

-	/**

-	 * the object for which we want the label

-	 */

-	private Object object;

-

-

-

-	/**

-	 * *

-	 * Constructor.

-	 *

-	 * @param object

-	 *            the cell for which we want the label/icon, ...

-	 * @param registry

-	 *            the registry used by nattable

-	 * 

-	 * @deprecated since Eclipse Mars, please use setter method

-	 */

-	@Deprecated

-	public LabelProviderContextElementWrapper(final Object object, final IConfigRegistry registry) {

-		this.object = object;

-		this.registry = registry;

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 */

-	public LabelProviderContextElementWrapper() {

-		// nothing to do

-	}

-

-	/**

-	 * 

-	 * @param configRegistry

-	 *            the config registry to use

-	 */

-	public void setConfigRegistry(IConfigRegistry configRegistry) {

-		this.registry = configRegistry;

-	}

-

-	/**

-	 * 

-	 * @param object

-	 *            the object for which we want the label/icon,....

-	 */

-	public void setObject(Object object) {

-		this.object = object;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper#getConfigRegistry()

-	 *

-	 * @return

-	 */

-	@Override

-	public IConfigRegistry getConfigRegistry() {

-		return this.registry;

-	}

-

-	/**

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getObject() {

-		return this.object;

-	}

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+
+/**
+ * This object can used as context to find the best label provider and get the text to display.
+ * Its allows to have the context of the value to use it in the label provider
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class LabelProviderContextElementWrapper implements ILabelProviderContextElementWrapper {
+
+	/**
+	 * the config registry of the table
+	 */
+	private IConfigRegistry registry;
+
+	/**
+	 * the object for which we want the label
+	 */
+	private Object object;
+
+
+
+	/**
+	 * *
+	 * Constructor.
+	 *
+	 * @param object
+	 *            the cell for which we want the label/icon, ...
+	 * @param registry
+	 *            the registry used by nattable
+	 * 
+	 * @deprecated since Eclipse Mars, please use setter method
+	 */
+	@Deprecated
+	public LabelProviderContextElementWrapper(final Object object, final IConfigRegistry registry) {
+		this.object = object;
+		this.registry = registry;
+	}
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 */
+	public LabelProviderContextElementWrapper() {
+		// nothing to do
+	}
+
+	/**
+	 * 
+	 * @param configRegistry
+	 *            the config registry to use
+	 */
+	public void setConfigRegistry(IConfigRegistry configRegistry) {
+		this.registry = configRegistry;
+	}
+
+	/**
+	 * 
+	 * @param object
+	 *            the object for which we want the label/icon,....
+	 */
+	public void setObject(Object object) {
+		this.object = object;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper#getConfigRegistry()
+	 *
+	 * @return
+	 */
+	@Override
+	public IConfigRegistry getConfigRegistry() {
+		return this.registry;
+	}
+
+	/**
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getObject() {
+		return this.object;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
index 7df40885882..948ac094519 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
@@ -1,229 +1,229 @@
-/*****************************************************************************

- * 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.utils;

-

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.swt.graphics.Point;

-

-/**

- *

- * This class allows to store information about a location

- *

- */

-public class LocationValue {

-

-	/**

-	 * the initial point (mouse information)

-	 */

-	final private Point absolutePoint;

-

-	/**

-	 * the same point, but in the coordinate of the widget

-	 */

-	final private Point widgetPoint;

-

-

-	/**

-	 * the kind of the location

-	 */

-	final private TableGridRegion kind;

-

-	/**

-	 * the column index

-	 */

-	final private int columnIndex;

-

-	/**

-	 * the row index

-	 */

-	final private int rowIndex;

-

-	/**

-	 * the layerCell if this location

-	 */

-	final private ILayerCell layerCell;

-

-	/**

-	 * the columnObject

-	 */

-	final private Object columnObject;

-

-	/**

-	 * the rowObject

-	 */

-	final private Object rowObject;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param kind

-	 *            the kind of location

-	 * @param cell

-	 *            the cell located as this place

-	 * @param columnIndex

-	 *            the columnIndex

-	 * @param rowIndex

-	 *            the rowIndex

-	 * @param columnObject

-	 *            the column object

-	 * @param rowObject

-	 *            the row object

-	 */

-	public LocationValue(final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {

-		this(null, null, kind, cell, columnIndex, rowIndex, columnObject, rowObject);

-	}

-

-

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param absoluteLocation

-	 *            a location in the absolute coordinate

-	 * @param widgetLocation

-	 *            the same point, but with the widget coordinate

-	 * @param kind

-	 *            the kind of location

-	 * @param cell

-	 *            the cell located as this place

-	 * @param columnIndex

-	 *            the columnIndex

-	 * @param rowIndex

-	 *            the rowIndex

-	 * @param columnObject

-	 *            the column object

-	 * @param rowObject

-	 *            the row object

-	 */

-	public LocationValue(final Point absoluteLocation, final Point widgetLocation, final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {

-		this.absolutePoint = absoluteLocation;

-		this.widgetPoint = widgetLocation;

-		this.kind = kind;

-		this.layerCell = cell;

-		this.columnIndex = columnIndex;

-		this.rowIndex = rowIndex;

-		this.columnObject = columnObject;

-		this.rowObject = rowObject;

-	}

-

-	/**

-	 * Gets the point.

-	 *

-	 * @return the point

-	 */

-	public Point getPoint() {

-		return absolutePoint;

-	}

-

-

-	/**

-	 * Gets the translated point.

-	 *

-	 * @return the translated point

-	 */

-	public Point getTranslatedPoint() {

-		return widgetPoint;

-	}

-

-	/**

-	 * Gets the kind.

-	 *

-	 * @return the kind

-	 */

-	public TableGridRegion getKind() {

-		return kind;

-	}

-

-

-	/**

-	 * Gets the column index.

-	 *

-	 * @return the column index

-	 */

-	public int getColumnIndex() {

-		return columnIndex;

-	}

-

-

-	/**

-	 * Gets the row index.

-	 *

-	 * @return the row index

-	 */

-	public int getRowIndex() {

-		return rowIndex;

-	}

-

-

-	/**

-	 * Gets the layer cell.

-	 *

-	 * @return the layer cell

-	 */

-	public ILayerCell getLayerCell() {

-		return layerCell;

-	}

-

-	/**

-	 * Gets the absolute point.

-	 *

-	 * @return the absolute point

-	 */

-	public Point getAbsolutePoint() {

-		return absolutePoint;

-	}

-

-

-	/**

-	 * Gets the widget point.

-	 *

-	 * @return the widget point

-	 */

-	public Point getWidgetPoint() {

-		return widgetPoint;

-	}

-

-

-	/**

-	 * Gets the column object.

-	 *

-	 * @return the column object

-	 */

-	public Object getColumnObject() {

-		return columnObject;

-	}

-

-

-	/**

-	 * Gets the row object.

-	 *

-	 * @return the row object

-	 */

-	public Object getRowObject() {

-		return rowObject;

-	}

-

-	/**

-	 *

-	 * @see java.lang.Object#toString()

-	 *

-	 * @return

-	 */

-	@Override

-	public String toString() {

-		String message = "location : " + this.kind + ", columnIndex :" + this.columnIndex + ", rowIndex :" + this.rowIndex + ", columnObject :" + this.columnObject + ", rowObject :" + this.rowObject; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

-		return message;

-	}

-}

+/*****************************************************************************
+ * 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.utils;
+
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ *
+ * This class allows to store information about a location
+ *
+ */
+public class LocationValue {
+
+	/**
+	 * the initial point (mouse information)
+	 */
+	final private Point absolutePoint;
+
+	/**
+	 * the same point, but in the coordinate of the widget
+	 */
+	final private Point widgetPoint;
+
+
+	/**
+	 * the kind of the location
+	 */
+	final private TableGridRegion kind;
+
+	/**
+	 * the column index
+	 */
+	final private int columnIndex;
+
+	/**
+	 * the row index
+	 */
+	final private int rowIndex;
+
+	/**
+	 * the layerCell if this location
+	 */
+	final private ILayerCell layerCell;
+
+	/**
+	 * the columnObject
+	 */
+	final private Object columnObject;
+
+	/**
+	 * the rowObject
+	 */
+	final private Object rowObject;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param kind
+	 *            the kind of location
+	 * @param cell
+	 *            the cell located as this place
+	 * @param columnIndex
+	 *            the columnIndex
+	 * @param rowIndex
+	 *            the rowIndex
+	 * @param columnObject
+	 *            the column object
+	 * @param rowObject
+	 *            the row object
+	 */
+	public LocationValue(final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {
+		this(null, null, kind, cell, columnIndex, rowIndex, columnObject, rowObject);
+	}
+
+
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param absoluteLocation
+	 *            a location in the absolute coordinate
+	 * @param widgetLocation
+	 *            the same point, but with the widget coordinate
+	 * @param kind
+	 *            the kind of location
+	 * @param cell
+	 *            the cell located as this place
+	 * @param columnIndex
+	 *            the columnIndex
+	 * @param rowIndex
+	 *            the rowIndex
+	 * @param columnObject
+	 *            the column object
+	 * @param rowObject
+	 *            the row object
+	 */
+	public LocationValue(final Point absoluteLocation, final Point widgetLocation, final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {
+		this.absolutePoint = absoluteLocation;
+		this.widgetPoint = widgetLocation;
+		this.kind = kind;
+		this.layerCell = cell;
+		this.columnIndex = columnIndex;
+		this.rowIndex = rowIndex;
+		this.columnObject = columnObject;
+		this.rowObject = rowObject;
+	}
+
+	/**
+	 * Gets the point.
+	 *
+	 * @return the point
+	 */
+	public Point getPoint() {
+		return absolutePoint;
+	}
+
+
+	/**
+	 * Gets the translated point.
+	 *
+	 * @return the translated point
+	 */
+	public Point getTranslatedPoint() {
+		return widgetPoint;
+	}
+
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
+	public TableGridRegion getKind() {
+		return kind;
+	}
+
+
+	/**
+	 * Gets the column index.
+	 *
+	 * @return the column index
+	 */
+	public int getColumnIndex() {
+		return columnIndex;
+	}
+
+
+	/**
+	 * Gets the row index.
+	 *
+	 * @return the row index
+	 */
+	public int getRowIndex() {
+		return rowIndex;
+	}
+
+
+	/**
+	 * Gets the layer cell.
+	 *
+	 * @return the layer cell
+	 */
+	public ILayerCell getLayerCell() {
+		return layerCell;
+	}
+
+	/**
+	 * Gets the absolute point.
+	 *
+	 * @return the absolute point
+	 */
+	public Point getAbsolutePoint() {
+		return absolutePoint;
+	}
+
+
+	/**
+	 * Gets the widget point.
+	 *
+	 * @return the widget point
+	 */
+	public Point getWidgetPoint() {
+		return widgetPoint;
+	}
+
+
+	/**
+	 * Gets the column object.
+	 *
+	 * @return the column object
+	 */
+	public Object getColumnObject() {
+		return columnObject;
+	}
+
+
+	/**
+	 * Gets the row object.
+	 *
+	 * @return the row object
+	 */
+	public Object getRowObject() {
+		return rowObject;
+	}
+
+	/**
+	 *
+	 * @see java.lang.Object#toString()
+	 *
+	 * @return
+	 */
+	@Override
+	public String toString() {
+		String message = "location : " + this.kind + ", columnIndex :" + this.columnIndex + ", rowIndex :" + this.rowIndex + ", columnObject :" + this.columnObject + ", rowObject :" + this.rowObject; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		return message;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java
index 301c3cadbf7..86f78dae0c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java
@@ -1,202 +1,202 @@
-/*****************************************************************************

- * Copyright (c) 2014, 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:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.HashMap;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-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.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * The property tester used to enable or disable the merge options in the merge menu of the table

- *

- * @author Quentin Le Menez

- *

- */

-public class NattableMergePropertyTester extends PropertyTester {

-

-	@Override

-	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		// the map used to quickly identify the merge states of the table

-		HashMap<String, Boolean> mergeMap = new HashMap<String, Boolean>();

-		// the manager of the table

-		INattableModelManager manager = getNattableModelManager();

-		if (manager == null) {

-			return false;

-		}

-

-		// the row Headers where the merge booleans concerning the allRows and allColumns merges and their values

-		AbstractHeaderAxisConfiguration rowHeader = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());

-		AbstractHeaderAxisConfiguration columnHeader = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());

-		BooleanValueStyle rowsMerge = (BooleanValueStyle) rowHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);

-		BooleanValueStyle columnsMerge = (BooleanValueStyle) columnHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);

-		// the booleans concerning the merge of selected rows or columns

-		boolean selectedRowsMerge = getToMergeRowBoolean();

-		boolean selectedColumnsMerge = getToMergeColumnBoolean();

-		// BooleanValueStyle tableMerge = (BooleanValueStyle)manager.getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGETABLE);

-

-

-		// fills out the map in order to avoid having to check for the existence/value of the merge boolean

-		if (rowsMerge != null) {

-			mergeMap.put(NamedStyleConstants.MERGE_ROWS, rowsMerge.isBooleanValue());

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_ROWS, false);

-		}

-		if (columnsMerge != null) {

-			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, columnsMerge.isBooleanValue());

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, false);

-		}

-		if (selectedRowsMerge) {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, selectedRowsMerge);

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, false);

-		}

-		if (selectedColumnsMerge) {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, selectedColumnsMerge);

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, false);

-		}

-		// if(tableMerge != null) {

-		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, tableMerge.isBooleanValue());

-		// } else {

-		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, false);

-		// }

-

-		// verify the availability of each merge option in order to allow the activation of its associated handler

-		if (getNattableModelManager() != null && expectedValue instanceof Boolean) {

-			if (NamedStyleConstants.MERGE_ROWS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_ROWS);

-				}

-			} else if (NamedStyleConstants.MERGE_COLUMNS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_COLUMNS);

-				}

-			} else if (NamedStyleConstants.MERGE_SELECTED_ROWS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS);

-				}

-			} else if (NamedStyleConstants.MERGE_SELECTED_COLUMNS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS);

-				}

-				// } else if(NamedStyleConstants.MERGE_TABLE.equals(property)) {

-				// if(!tableMerged(mergeMap)) {

-				// return true;

-				// } else {

-				// return mergeMap.get(NamedStyleConstants.MERGE_TABLE);

-				// }

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the current nattable model manager or <code>null</code> if not found

-	 */

-	protected INattableModelManager getNattableModelManager() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		IWorkbenchPart current = null;

-		if (workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if (activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if (activePage != null) {

-					current = activePage.getActivePart();

-				}

-			}

-		}

-

-		if (current != null) {

-			return (INattableModelManager) current.getAdapter(INattableModelManager.class);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * Identifies if the table is already merged or not

-	 *

-	 */

-	protected boolean tableMerged(HashMap<String, Boolean> mergeMap) {

-		// verify if none of the merge options are active, all must then be available (restrictions to false)

-		// if(!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS)

-		// && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_TABLE)) {

-		if (!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS)) {

-			return false;

-		} else {

-			return true;

-		}

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the boolean indicating that some row axis are to be merged in the selection

-	 */

-	protected boolean getToMergeRowBoolean() {

-		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentRowAxisProvider().getAxis()) {

-		for (Object currentObject : getNattableModelManager().getRowElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the boolean indicating that some column axis are to be merged in the selection

-	 */

-	protected boolean getToMergeColumnBoolean() {

-		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentColumnAxisProvider().getAxis()) {

-		for (Object currentObject : getNattableModelManager().getColumnElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 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:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.HashMap;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+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.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * The property tester used to enable or disable the merge options in the merge menu of the table
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class NattableMergePropertyTester extends PropertyTester {
+
+	@Override
+	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
+		// the map used to quickly identify the merge states of the table
+		HashMap<String, Boolean> mergeMap = new HashMap<String, Boolean>();
+		// the manager of the table
+		INattableModelManager manager = getNattableModelManager();
+		if (manager == null) {
+			return false;
+		}
+
+		// the row Headers where the merge booleans concerning the allRows and allColumns merges and their values
+		AbstractHeaderAxisConfiguration rowHeader = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());
+		AbstractHeaderAxisConfiguration columnHeader = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());
+		BooleanValueStyle rowsMerge = (BooleanValueStyle) rowHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);
+		BooleanValueStyle columnsMerge = (BooleanValueStyle) columnHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);
+		// the booleans concerning the merge of selected rows or columns
+		boolean selectedRowsMerge = getToMergeRowBoolean();
+		boolean selectedColumnsMerge = getToMergeColumnBoolean();
+		// BooleanValueStyle tableMerge = (BooleanValueStyle)manager.getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGETABLE);
+
+
+		// fills out the map in order to avoid having to check for the existence/value of the merge boolean
+		if (rowsMerge != null) {
+			mergeMap.put(NamedStyleConstants.MERGE_ROWS, rowsMerge.isBooleanValue());
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_ROWS, false);
+		}
+		if (columnsMerge != null) {
+			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, columnsMerge.isBooleanValue());
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, false);
+		}
+		if (selectedRowsMerge) {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, selectedRowsMerge);
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, false);
+		}
+		if (selectedColumnsMerge) {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, selectedColumnsMerge);
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, false);
+		}
+		// if(tableMerge != null) {
+		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, tableMerge.isBooleanValue());
+		// } else {
+		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, false);
+		// }
+
+		// verify the availability of each merge option in order to allow the activation of its associated handler
+		if (getNattableModelManager() != null && expectedValue instanceof Boolean) {
+			if (NamedStyleConstants.MERGE_ROWS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_ROWS);
+				}
+			} else if (NamedStyleConstants.MERGE_COLUMNS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_COLUMNS);
+				}
+			} else if (NamedStyleConstants.MERGE_SELECTED_ROWS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS);
+				}
+			} else if (NamedStyleConstants.MERGE_SELECTED_COLUMNS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS);
+				}
+				// } else if(NamedStyleConstants.MERGE_TABLE.equals(property)) {
+				// if(!tableMerged(mergeMap)) {
+				// return true;
+				// } else {
+				// return mergeMap.get(NamedStyleConstants.MERGE_TABLE);
+				// }
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the current nattable model manager or <code>null</code> if not found
+	 */
+	protected INattableModelManager getNattableModelManager() {
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		IWorkbenchPart current = null;
+		if (workbench != null) {
+			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();
+			if (activeWorkbench != null) {
+				final IWorkbenchPage activePage = activeWorkbench.getActivePage();
+				if (activePage != null) {
+					current = activePage.getActivePart();
+				}
+			}
+		}
+
+		if (current != null) {
+			return (INattableModelManager) current.getAdapter(INattableModelManager.class);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * Identifies if the table is already merged or not
+	 *
+	 */
+	protected boolean tableMerged(HashMap<String, Boolean> mergeMap) {
+		// verify if none of the merge options are active, all must then be available (restrictions to false)
+		// if(!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS)
+		// && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_TABLE)) {
+		if (!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS)) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the boolean indicating that some row axis are to be merged in the selection
+	 */
+	protected boolean getToMergeRowBoolean() {
+		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentRowAxisProvider().getAxis()) {
+		for (Object currentObject : getNattableModelManager().getRowElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the boolean indicating that some column axis are to be merged in the selection
+	 */
+	protected boolean getToMergeColumnBoolean() {
+		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentColumnAxisProvider().getAxis()) {
+		for (Object currentObject : getNattableModelManager().getColumnElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
index e62a510b491..2ff9e322a4f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-

-

-/**

- * Utils class for paste actions

- *

- * @author Vincent Lorenzo

- *

- */

-public class PasteConfigurationUtils {

-

-

-	private PasteConfigurationUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param pasteConfiguration

-	 *            a paste configuration

-	 * @return

-	 *         a status describing the consistence of the paste configuration

-	 */

-	public static IStatus hasConsistentPasteEObjectConfiguration(final PasteEObjectConfiguration pasteConfiguration) {

-		Assert.isNotNull(pasteConfiguration);

-		final String pluginId = Activator.PLUGIN_ID;

-		final EStructuralFeature feature = pasteConfiguration.getPasteElementContainementFeature();

-		if (feature == null) {

-			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNull);

-		} else if (feature instanceof EReference) {

-			if (!((EReference) feature).isContainment()) {

-				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNotAReferenceContainment);

-			}

-			final String elementId = pasteConfiguration.getPastedElementId();

-			if (elementId != null && !elementId.equals("")) { //$NON-NLS-1$

-				final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementId);

-				if (elementType != null) {

-					final EClass elementTypeMetaclass = elementType.getEClass();

-					final EClass containmentFeatureEClass = (EClass) feature.getEType();

-					boolean knownFeature = elementTypeMetaclass == containmentFeatureEClass || containmentFeatureEClass.isSuperTypeOf(elementTypeMetaclass);

-					if (knownFeature) {

-						return new Status(IStatus.OK, pluginId, Messages.PasteConfigurationUtils_PasteConfigurationIsConsistent);

-					} else {

-						return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_CreatesElementsAreNotCompatibleWithContainmentFeature, elementId, containmentFeatureEClass.getName()));

-					}

-				} else {

-					return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_ElementTypeCantBeFound, elementId));

-				}

-			} else {

-				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ElementIdNotDefined);

-			}

-		} else {

-			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainementFeatureIsNotAReference);

-		}

-	}

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+
+
+/**
+ * Utils class for paste actions
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PasteConfigurationUtils {
+
+
+	private PasteConfigurationUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param pasteConfiguration
+	 *            a paste configuration
+	 * @return
+	 *         a status describing the consistence of the paste configuration
+	 */
+	public static IStatus hasConsistentPasteEObjectConfiguration(final PasteEObjectConfiguration pasteConfiguration) {
+		Assert.isNotNull(pasteConfiguration);
+		final String pluginId = Activator.PLUGIN_ID;
+		final EStructuralFeature feature = pasteConfiguration.getPasteElementContainementFeature();
+		if (feature == null) {
+			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNull);
+		} else if (feature instanceof EReference) {
+			if (!((EReference) feature).isContainment()) {
+				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNotAReferenceContainment);
+			}
+			final String elementId = pasteConfiguration.getPastedElementId();
+			if (elementId != null && !elementId.equals("")) { //$NON-NLS-1$
+				final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementId);
+				if (elementType != null) {
+					final EClass elementTypeMetaclass = elementType.getEClass();
+					final EClass containmentFeatureEClass = (EClass) feature.getEType();
+					boolean knownFeature = elementTypeMetaclass == containmentFeatureEClass || containmentFeatureEClass.isSuperTypeOf(elementTypeMetaclass);
+					if (knownFeature) {
+						return new Status(IStatus.OK, pluginId, Messages.PasteConfigurationUtils_PasteConfigurationIsConsistent);
+					} else {
+						return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_CreatesElementsAreNotCompatibleWithContainmentFeature, elementId, containmentFeatureEClass.getName()));
+					}
+				} else {
+					return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_ElementTypeCantBeFound, elementId));
+				}
+			} else {
+				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ElementIdNotDefined);
+			}
+		} else {
+			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainementFeatureIsNotAReference);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
index 3270e89ab57..f47ca71f4d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * 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.utils;

-

-import org.eclipse.core.runtime.MultiStatus;

-

-/**

- *

- * This class is used to store the tests about the paste capability of the table

- *

- */

-public class PasteEnablementStatus {

-

-	/**

-	 * the result of the tests to paste rows in the table

-	 */

-	private MultiStatus rowStatus;

-

-	/**

-	 * the result of the test to paste columns in the table

-	 */

-	private MultiStatus columnStatus;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param columnStatus

-	 *            the paste column status

-	 * @param rowStatus

-	 *            the paste row status

-	 */

-	public PasteEnablementStatus(final MultiStatus columnStatus, final MultiStatus rowStatus) {

-		this.rowStatus = rowStatus;

-		this.columnStatus = columnStatus;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the paste mode according to the row and column status

-	 */

-	public PasteModeEnumeration getPasteMode() {

-		if (this.rowStatus == null && this.columnStatus == null) {

-			return PasteModeEnumeration.PASTE_NO_CONFIGURATION;

-		}

-		if (this.rowStatus != null && this.columnStatus != null) {

-			if (this.columnStatus.isOK() && this.rowStatus.isOK()) {

-				return PasteModeEnumeration.PASTE_EOBJECT_ROW_OR_COLUMN;

-			}

-			if (this.columnStatus.isOK() && !this.rowStatus.isOK()) {

-				return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;

-			}

-			if (!this.columnStatus.isOK() && this.rowStatus.isOK()) {

-				return PasteModeEnumeration.PASTE_EOBJECT_ROW;

-			}

-		}

-		if (this.rowStatus != null && this.rowStatus.isOK() && this.columnStatus == null) {

-			return PasteModeEnumeration.PASTE_EOBJECT_ROW;

-		}

-		if (this.columnStatus != null && this.rowStatus == null && this.columnStatus.isOK()) {

-			return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;

-		}

-		return PasteModeEnumeration.CANT_PASTE;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the column status

-	 */

-	public MultiStatus getColumnStatus() {

-		return this.columnStatus;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the row status

-	 */

-	public MultiStatus getRowStatus() {

-		return this.rowStatus;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.utils;
+
+import org.eclipse.core.runtime.MultiStatus;
+
+/**
+ *
+ * This class is used to store the tests about the paste capability of the table
+ *
+ */
+public class PasteEnablementStatus {
+
+	/**
+	 * the result of the tests to paste rows in the table
+	 */
+	private MultiStatus rowStatus;
+
+	/**
+	 * the result of the test to paste columns in the table
+	 */
+	private MultiStatus columnStatus;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param columnStatus
+	 *            the paste column status
+	 * @param rowStatus
+	 *            the paste row status
+	 */
+	public PasteEnablementStatus(final MultiStatus columnStatus, final MultiStatus rowStatus) {
+		this.rowStatus = rowStatus;
+		this.columnStatus = columnStatus;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the paste mode according to the row and column status
+	 */
+	public PasteModeEnumeration getPasteMode() {
+		if (this.rowStatus == null && this.columnStatus == null) {
+			return PasteModeEnumeration.PASTE_NO_CONFIGURATION;
+		}
+		if (this.rowStatus != null && this.columnStatus != null) {
+			if (this.columnStatus.isOK() && this.rowStatus.isOK()) {
+				return PasteModeEnumeration.PASTE_EOBJECT_ROW_OR_COLUMN;
+			}
+			if (this.columnStatus.isOK() && !this.rowStatus.isOK()) {
+				return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;
+			}
+			if (!this.columnStatus.isOK() && this.rowStatus.isOK()) {
+				return PasteModeEnumeration.PASTE_EOBJECT_ROW;
+			}
+		}
+		if (this.rowStatus != null && this.rowStatus.isOK() && this.columnStatus == null) {
+			return PasteModeEnumeration.PASTE_EOBJECT_ROW;
+		}
+		if (this.columnStatus != null && this.rowStatus == null && this.columnStatus.isOK()) {
+			return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;
+		}
+		return PasteModeEnumeration.CANT_PASTE;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the column status
+	 */
+	public MultiStatus getColumnStatus() {
+		return this.columnStatus;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the row status
+	 */
+	public MultiStatus getRowStatus() {
+		return this.rowStatus;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
index 1ba3d9749ce..97b57758507 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
@@ -1,154 +1,154 @@
-/*****************************************************************************

- * 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.utils;

-

-/**

- *

- * This class provides utils method to split a string to do a paste in the table

- *

- */

-public class PasteHelper {

-

-	/**

-	 * the default separator used for row

-	 */

-	public static final String DEFAULT_ROW_SEPARATOR = "\n"; //$NON-NLS-1" //$NON-NLS-1$

-

-	/**

-	 * the default separator used for columns

-	 */

-	public static final String DEFAULT_COLUMN_SEPARATOR = "\t";//$NON-NLS-1" //$NON-NLS-1$

-

-	/**

-	 * the default separator used for multivalue

-	 */

-	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

-

-

-	private final String rowSeparator;

-

-	private final String columnSeparator;

-

-	private final String multiValueSeparator;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public PasteHelper() {

-		this(DEFAULT_COLUMN_SEPARATOR, DEFAULT_ROW_SEPARATOR, DEFAULT_MULTI_VALUE_SEPARATOR);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param columnSeparator

-	 *            the column separator to use

-	 * @param rowSeparator

-	 *            the row separator to use

-	 * @param multiValueSeparator

-	 *            the multi value separator to use

-	 */

-	public PasteHelper(final String columnSeparator, final String rowSeparator, final String multiValueSeparator) {

-		this.columnSeparator = columnSeparator;

-		this.rowSeparator = rowSeparator;

-		this.multiValueSeparator = multiValueSeparator;

-	}

-

-	/**

-	 *

-	 * @param axisAsString

-	 *            an full axis represented by a String

-	 *

-	 *

-	 * @return

-	 *         the cells using the specified cell separator

-	 */

-

-	public String[] getCellsAsStringFromAxis(final String axisAsString) {

-		return axisAsString.split(this.columnSeparator);

-	}

-

-	/**

-	 *

-	 * @param fullContents

-	 *            the string to split

-	 *

-	 * @return

-	 *         the rows

-	 */

-	public final String[] getRows(final String fullContents) {

-		final String[] rows = fullContents.split(this.rowSeparator);

-		return rows;

-	}

-

-	/**

-	 *

-	 * @param fullContents

-	 * @param rowSeparator

-	 * @param columnSeparator

-	 * @return

-	 *         an array of the pasted columns

-	 */

-	// TODO refactor me the paste in column should be the same as the paste in row!

-	public final String[] getColumns(final String fullContents) {

-		final String[] rows = fullContents.split(rowSeparator);

-		if (rows.length > 0) {

-			int nbColumn = rows[0].split(columnSeparator).length;

-			String[] columns = new String[nbColumn];

-			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-				columns[columnIndex] = ""; //$NON-NLS-1$

-			}

-

-			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {

-				String row = rows[rowIndex];

-				String[] currentColumns = row.split(columnSeparator);

-				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-					if (currentColumns.length != 0) {

-						columns[columnIndex] += currentColumns[columnIndex];

-					} else {

-						columns[columnIndex] += ""; //$NON-NLS-1$

-					}

-					if (rowIndex < rows.length + 1) {

-						columns[columnIndex] += columnSeparator;

-					} else {

-						columns[columnIndex] += rowSeparator;

-					}

-				}

-			}

-			return columns;

-

-		}

-		return null;

-	}

-

-

-	public String getRowSeparator() {

-		return rowSeparator;

-	}

-

-

-	public String getColumnSeparator() {

-		return columnSeparator;

-	}

-

-

-	public String getMultiValueSeparator() {

-		return multiValueSeparator;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.utils;
+
+/**
+ *
+ * This class provides utils method to split a string to do a paste in the table
+ *
+ */
+public class PasteHelper {
+
+	/**
+	 * the default separator used for row
+	 */
+	public static final String DEFAULT_ROW_SEPARATOR = "\n"; //$NON-NLS-1" //$NON-NLS-1$
+
+	/**
+	 * the default separator used for columns
+	 */
+	public static final String DEFAULT_COLUMN_SEPARATOR = "\t";//$NON-NLS-1" //$NON-NLS-1$
+
+	/**
+	 * the default separator used for multivalue
+	 */
+	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$
+
+
+	private final String rowSeparator;
+
+	private final String columnSeparator;
+
+	private final String multiValueSeparator;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public PasteHelper() {
+		this(DEFAULT_COLUMN_SEPARATOR, DEFAULT_ROW_SEPARATOR, DEFAULT_MULTI_VALUE_SEPARATOR);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param columnSeparator
+	 *            the column separator to use
+	 * @param rowSeparator
+	 *            the row separator to use
+	 * @param multiValueSeparator
+	 *            the multi value separator to use
+	 */
+	public PasteHelper(final String columnSeparator, final String rowSeparator, final String multiValueSeparator) {
+		this.columnSeparator = columnSeparator;
+		this.rowSeparator = rowSeparator;
+		this.multiValueSeparator = multiValueSeparator;
+	}
+
+	/**
+	 *
+	 * @param axisAsString
+	 *            an full axis represented by a String
+	 *
+	 *
+	 * @return
+	 *         the cells using the specified cell separator
+	 */
+
+	public String[] getCellsAsStringFromAxis(final String axisAsString) {
+		return axisAsString.split(this.columnSeparator);
+	}
+
+	/**
+	 *
+	 * @param fullContents
+	 *            the string to split
+	 *
+	 * @return
+	 *         the rows
+	 */
+	public final String[] getRows(final String fullContents) {
+		final String[] rows = fullContents.split(this.rowSeparator);
+		return rows;
+	}
+
+	/**
+	 *
+	 * @param fullContents
+	 * @param rowSeparator
+	 * @param columnSeparator
+	 * @return
+	 *         an array of the pasted columns
+	 */
+	// TODO refactor me the paste in column should be the same as the paste in row!
+	public final String[] getColumns(final String fullContents) {
+		final String[] rows = fullContents.split(rowSeparator);
+		if (rows.length > 0) {
+			int nbColumn = rows[0].split(columnSeparator).length;
+			String[] columns = new String[nbColumn];
+			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+				columns[columnIndex] = ""; //$NON-NLS-1$
+			}
+
+			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+				String row = rows[rowIndex];
+				String[] currentColumns = row.split(columnSeparator);
+				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+					if (currentColumns.length != 0) {
+						columns[columnIndex] += currentColumns[columnIndex];
+					} else {
+						columns[columnIndex] += ""; //$NON-NLS-1$
+					}
+					if (rowIndex < rows.length + 1) {
+						columns[columnIndex] += columnSeparator;
+					} else {
+						columns[columnIndex] += rowSeparator;
+					}
+				}
+			}
+			return columns;
+
+		}
+		return null;
+	}
+
+
+	public String getRowSeparator() {
+		return rowSeparator;
+	}
+
+
+	public String getColumnSeparator() {
+		return columnSeparator;
+	}
+
+
+	public String getMultiValueSeparator() {
+		return multiValueSeparator;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
index 83480373fcf..f6bd4068ce1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * 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;

-

-/**

- * Literals used to describe the paste mode

- *

- * @author Vincent Lorenzo

- *

- */

-public enum PasteModeEnumeration {

-

-	/**

-	 * the user want paste rows

-	 */

-	PASTE_EOBJECT_ROW,

-	/**

-	 * the user wants paste columns

-	 */

-	PASTE_EOBJECT_COLUMN,

-	/**

-	 * the system can't decide if the user want paste rows or columns

-	 */

-	PASTE_EOBJECT_ROW_OR_COLUMN,

-	/**

-	 * configuration exist but the configuration is not valid

-	 */

-	CANT_PASTE,

-

-	/**

-	 * the table have any configuration for paste

-	 */

-	PASTE_NO_CONFIGURATION;

-

-}

+/*****************************************************************************
+ * 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;
+
+/**
+ * Literals used to describe the paste mode
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public enum PasteModeEnumeration {
+
+	/**
+	 * the user want paste rows
+	 */
+	PASTE_EOBJECT_ROW,
+	/**
+	 * the user wants paste columns
+	 */
+	PASTE_EOBJECT_COLUMN,
+	/**
+	 * the system can't decide if the user want paste rows or columns
+	 */
+	PASTE_EOBJECT_ROW_OR_COLUMN,
+	/**
+	 * configuration exist but the configuration is not valid
+	 */
+	CANT_PASTE,
+
+	/**
+	 * the table have any configuration for paste
+	 */
+	PASTE_NO_CONFIGURATION;
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
index 4edd7453191..b4f5e255dde 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * 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.utils;

-

-/**

- * @author Vincent Lorenzo

- * 

- *         This class provides code which can be provided by Paste Action in the table

- */

-public class PasteSeverityCode {

-

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private PasteSeverityCode() {

-		// to prevent instanciation

-	}

-	

-	/**

-	 * the severity code used when there is no containment feature declared in the configuration

-	 */

-	public static final int PASTE_ERROR__NO_CONTAINMENT_FEATURE = 0;

-	

-	/**

-	 * the severity code used when there is no paste configuration found

-	 */

-	public static final int PASTE_ERROR__NO_PASTE_CONFIGURATION = PASTE_ERROR__NO_CONTAINMENT_FEATURE+1;

-

-	/**

-	 * no element type defined for the paste

-	 */

-	public static final int PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION = PASTE_ERROR__NO_PASTE_CONFIGURATION + 1;

-

-	/**

-	 * A depth is hidden, but there is more than one category for the depth (we can't know which category choose for the paste)

-	 */

-	public static final int PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH = PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION + 1;

-

-	/**

-	 * Element type has not be definedS

-	 */

-	public static final int PASTE_ERROR__UNKNOWN_ELEMENT_TYPE = PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH + 1;

-

-	/**

-	 * the severity code used when we try to paste columns in a tree table

-	 */

-	public static final int PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE = PASTE_ERROR__UNKNOWN_ELEMENT_TYPE + 1;

-	

-	/**

-	 * the severity code used when more lines is pasted than the number of depth available

-	 */

-	public static final int PASTE_ERROR__MORE_LINES_THAN_DEPTH = PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE + 1;

-

-	/**

-	 * the severity code used when there are too many cells on a rows

-	 */

-	public static final int PASTE_WARNING__TOO_MANY_CELLS_ON_ROWS = PASTE_ERROR__MORE_LINES_THAN_DEPTH + 1;

-

-}

+/*****************************************************************************
+ * 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.utils;
+
+/**
+ * @author Vincent Lorenzo
+ * 
+ *         This class provides code which can be provided by Paste Action in the table
+ */
+public class PasteSeverityCode {
+
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private PasteSeverityCode() {
+		// to prevent instanciation
+	}
+	
+	/**
+	 * the severity code used when there is no containment feature declared in the configuration
+	 */
+	public static final int PASTE_ERROR__NO_CONTAINMENT_FEATURE = 0;
+	
+	/**
+	 * the severity code used when there is no paste configuration found
+	 */
+	public static final int PASTE_ERROR__NO_PASTE_CONFIGURATION = PASTE_ERROR__NO_CONTAINMENT_FEATURE+1;
+
+	/**
+	 * no element type defined for the paste
+	 */
+	public static final int PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION = PASTE_ERROR__NO_PASTE_CONFIGURATION + 1;
+
+	/**
+	 * A depth is hidden, but there is more than one category for the depth (we can't know which category choose for the paste)
+	 */
+	public static final int PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH = PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION + 1;
+
+	/**
+	 * Element type has not be definedS
+	 */
+	public static final int PASTE_ERROR__UNKNOWN_ELEMENT_TYPE = PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH + 1;
+
+	/**
+	 * the severity code used when we try to paste columns in a tree table
+	 */
+	public static final int PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE = PASTE_ERROR__UNKNOWN_ELEMENT_TYPE + 1;
+	
+	/**
+	 * the severity code used when more lines is pasted than the number of depth available
+	 */
+	public static final int PASTE_ERROR__MORE_LINES_THAN_DEPTH = PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE + 1;
+
+	/**
+	 * the severity code used when there are too many cells on a rows
+	 */
+	public static final int PASTE_WARNING__TOO_MANY_CELLS_ON_ROWS = PASTE_ERROR__MORE_LINES_THAN_DEPTH + 1;
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
index efdd03c5693..fe5dd51557e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
@@ -1,119 +1,119 @@
-/*****************************************************************************

- * 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.utils;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-

-/**

- *

- *

- */

-public class PasteTreeUtils {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private PasteTreeUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param nbReadCell

-	 *            the number of read cells (>0)

-	 * @param maxDepth

-	 *            the max depth of the table, this value start to 0

-	 * @param hiddenDepth

-	 *            the list of the hidden depth

-	 * @param hasConfigurationOnDepth0

-	 *            <code>true</code> if the table has a configuration on depth==0

-	 * @return

-	 *         the depth for the read cell

-	 */

-	public static final int getDepth(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {

-		int nbColumn = (maxDepth + 1) * 2;// depth start to 0

-		int readColumn = 0;

-		int depth = -1;

-		for (int i = 0; i < nbColumn; i++) {

-			// we cross the column table and we check if the column is visible

-			if (i % 2 == 0) {// it is the index of the category columns

-				depth++;

-				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {

-					readColumn++;

-				}

-			} else {

-				readColumn++;

-			}

-

-			if (readColumn == nbReadCell) {

-				if (!hasConfigurationOnDepth0) {

-					readColumn--;

-					hasConfigurationOnDepth0 = true;

-					continue;

-				}

-				return depth;

-			}

-		}

-		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @param nbReadCell

-	 *            the number of read cells (>0)

-	 * @param maxDepth

-	 *            the max depth of the table, this value start to 0

-	 * @param hiddenDepth

-	 *            the list of the hidden depth

-	 * @param hasConfigurationOnDepth0

-	 *            <code>true</code> if the table has a configuration on depth==0

-	 * @return

-	 *         <code>true</code> if the read cell represents a category

-	 */

-	public static final boolean isCategory(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {

-		Assert.isTrue(nbReadCell > 0);

-		int nbColumn = (maxDepth + 1) * 2;// depth start to 0

-		boolean isCategory;

-		int readColumn = 0;

-		for (int i = 0; i < nbColumn; i++) {

-			// we cross the column table and we check if the column is visible

-			if (i % 2 == 0) {// it is the index of the category columns

-				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {

-					isCategory = true;

-					readColumn++;

-				} else {

-					isCategory = false;

-				}

-			} else {

-				readColumn++;

-				isCategory = false;

-			}

-

-			if (readColumn == nbReadCell) {

-				if (!hasConfigurationOnDepth0) {

-					readColumn--;

-					hasConfigurationOnDepth0 = true;

-					continue;

-				}

-				return isCategory;

-			}

-		}

-		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$

-	}

-

-

-}

+/*****************************************************************************
+ * 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.utils;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+
+/**
+ *
+ *
+ */
+public class PasteTreeUtils {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private PasteTreeUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 
+	 * @param nbReadCell
+	 *            the number of read cells (>0)
+	 * @param maxDepth
+	 *            the max depth of the table, this value start to 0
+	 * @param hiddenDepth
+	 *            the list of the hidden depth
+	 * @param hasConfigurationOnDepth0
+	 *            <code>true</code> if the table has a configuration on depth==0
+	 * @return
+	 *         the depth for the read cell
+	 */
+	public static final int getDepth(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {
+		int nbColumn = (maxDepth + 1) * 2;// depth start to 0
+		int readColumn = 0;
+		int depth = -1;
+		for (int i = 0; i < nbColumn; i++) {
+			// we cross the column table and we check if the column is visible
+			if (i % 2 == 0) {// it is the index of the category columns
+				depth++;
+				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {
+					readColumn++;
+				}
+			} else {
+				readColumn++;
+			}
+
+			if (readColumn == nbReadCell) {
+				if (!hasConfigurationOnDepth0) {
+					readColumn--;
+					hasConfigurationOnDepth0 = true;
+					continue;
+				}
+				return depth;
+			}
+		}
+		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$
+	}
+
+	/**
+	 * 
+	 * @param nbReadCell
+	 *            the number of read cells (>0)
+	 * @param maxDepth
+	 *            the max depth of the table, this value start to 0
+	 * @param hiddenDepth
+	 *            the list of the hidden depth
+	 * @param hasConfigurationOnDepth0
+	 *            <code>true</code> if the table has a configuration on depth==0
+	 * @return
+	 *         <code>true</code> if the read cell represents a category
+	 */
+	public static final boolean isCategory(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {
+		Assert.isTrue(nbReadCell > 0);
+		int nbColumn = (maxDepth + 1) * 2;// depth start to 0
+		boolean isCategory;
+		int readColumn = 0;
+		for (int i = 0; i < nbColumn; i++) {
+			// we cross the column table and we check if the column is visible
+			if (i % 2 == 0) {// it is the index of the category columns
+				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {
+					isCategory = true;
+					readColumn++;
+				} else {
+					isCategory = false;
+				}
+			} else {
+				readColumn++;
+				isCategory = false;
+			}
+
+			if (readColumn == nbReadCell) {
+				if (!hasConfigurationOnDepth0) {
+					readColumn--;
+					hasConfigurationOnDepth0 = true;
+					continue;
+				}
+				return isCategory;
+			}
+		}
+		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
index 78f62610c22..9453f8bedb2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * 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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.Comparator;

-

-/**

- *

- * String comparator ignoring all non-words character

- *

- */

-public class StringComparator implements Comparator<String> {

-

-	/**

-	 *

-	 * @param o1

-	 * @param o2

-	 * @return

-	 */

-	@Override

-	public int compare(String str1, String str2) {

-		str1 = str1.replaceAll(AxisUtils.REGEX, "");//$NON-NLS-1$ //we keep only words characters (letters + numbers) + whitespace

-		str2 = str2.replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$

-		return str1.compareToIgnoreCase(str2);

-	};

-}

+/*****************************************************************************
+ * 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.Comparator;
+
+/**
+ *
+ * String comparator ignoring all non-words character
+ *
+ */
+public class StringComparator implements Comparator<String> {
+
+	/**
+	 *
+	 * @param o1
+	 * @param o2
+	 * @return
+	 */
+	@Override
+	public int compare(String str1, String str2) {
+		str1 = str1.replaceAll(AxisUtils.REGEX, "");//$NON-NLS-1$ //we keep only words characters (letters + numbers) + whitespace
+		str2 = str2.replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$
+		return str1.compareToIgnoreCase(str2);
+	};
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
index 29fe9f200a3..b2206a97dfa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
@@ -1,188 +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.utils;

-

-import org.eclipse.swt.dnd.Clipboard;

-import org.eclipse.swt.dnd.TextTransfer;

-import org.eclipse.swt.widgets.Display;

-

-

-

-/**

- * Util class to manage the clipboard

- *

- * @author Vincent Lorenzo

- *

- */

-public class TableClipboardUtils {

-

-	/**

-	 * row separator in the clipboard contents

-	 */

-	@Deprecated

-	// use the value defined in PasteHelpers

-	public static final String AXIS_SEPARATOR = "\n"; //$NON-NLS-1$

-

-	/**

-	 * column separator in the clipboard contents

-	 */

-	@Deprecated

-	// use the value defined into PasteHelper

-	public static final String CELL_SEPARATOR = "\t"; //$NON-NLS-1$

-

-	/**

-	 * the separator used for multivalue

-	 */

-	@Deprecated

-	// use the value defined into PasteHelper

-	public static final String MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

-

-	private TableClipboardUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param fullContents

-	 *            a table represented by a String

-	 * @return the rows for this table

-	 */

-	@Deprecated

-	// use PasteHelper

-	public static final String[] getRows(final String fullContents) {

-		final String[] rows = fullContents.split(AXIS_SEPARATOR);

-		return rows;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the rows as string extractzed from the clipboard

-	 */

-	@Deprecated

-	// use PasteHelper

-	public static final String[] getRowsFromClipboard() {

-		final String clipboardContent = getClipboardContents();

-		if (clipboardContent != null && !clipboardContent.isEmpty()) {

-			return getRows(clipboardContent);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the columns as string extractzed from the clipboard

-	 */

-	@Deprecated

-	// use PasteHelper

-	public static final String[] getColumnsFromClipboard() {

-		final String clipboardContent = getClipboardContents();

-		if (clipboardContent != null && !clipboardContent.isEmpty()) {

-			return getColumns(clipboardContent);

-		}

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the clipboard contents used to build the command

-	 */

-	private static final String getClipboardContents() {

-		// examine system clipboard with AWT

-//		String bufferSystem = null;

-//

-//

-//		java.awt.datatransfer.Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

-//

-//		if (clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {

-//			try {

-//				bufferSystem = clipboard.getData(DataFlavor.stringFlavor).toString();

-//			} catch (UnsupportedFlavorException e) {

-//				Activator.log.error(e);

-//			} catch (IOException e) {

-//				Activator.log.error(e);

-//			}

-//		}

-//

-//		return bufferSystem;

-

-//		 using SWT

-		 final Display display = Display.getCurrent();

-		 final Clipboard cb = new Clipboard(display);

-		 // we use the text transfert

-		 final TextTransfer transfer = TextTransfer.getInstance();

-		

-		// final Clipboard cb = new Clipboard(clipboard);

-		 final String contents = (String) cb.getContents(transfer);

-		

-		 return contents;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the contents of the clipboard

-	 */

-	public static final String getClipboardContentsAsString() {

-		return getClipboardContents();

-	}

-

-	/**

-	 *

-	 * @param row

-	 *            a row represented by a String

-	 * @return the cells for this row

-	 */

-	@Deprecated

-	// Use PasteHelpers#getCellsAsStringFromAxis

-	public static final String[] getCells(final String row) {

-		return row.split(CELL_SEPARATOR);

-	}

-

-

-	public static final String[] getColumns(final String fullContents) {

-		final String[] rows = fullContents.split(AXIS_SEPARATOR);

-		if (rows.length > 0) {

-			int nbColumn = rows[0].split(CELL_SEPARATOR).length;

-			String[] columns = new String[nbColumn];

-			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-				columns[columnIndex] = ""; //$NON-NLS-1$

-			}

-

-			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {

-				String row = rows[rowIndex];

-				String[] currentColumns = row.split(CELL_SEPARATOR);

-				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-					if (currentColumns.length != 0) {

-						columns[columnIndex] += currentColumns[columnIndex];

-					} else {

-						columns[columnIndex] += ""; //$NON-NLS-1$

-					}

-					if (rowIndex < rows.length + 1) {

-						columns[columnIndex] += CELL_SEPARATOR;

-					} else {

-						columns[columnIndex] += AXIS_SEPARATOR;

-					}

-				}

-			}

-			return columns;

-

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.widgets.Display;
+
+
+
+/**
+ * Util class to manage the clipboard
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TableClipboardUtils {
+
+	/**
+	 * row separator in the clipboard contents
+	 */
+	@Deprecated
+	// use the value defined in PasteHelpers
+	public static final String AXIS_SEPARATOR = "\n"; //$NON-NLS-1$
+
+	/**
+	 * column separator in the clipboard contents
+	 */
+	@Deprecated
+	// use the value defined into PasteHelper
+	public static final String CELL_SEPARATOR = "\t"; //$NON-NLS-1$
+
+	/**
+	 * the separator used for multivalue
+	 */
+	@Deprecated
+	// use the value defined into PasteHelper
+	public static final String MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$
+
+	private TableClipboardUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param fullContents
+	 *            a table represented by a String
+	 * @return the rows for this table
+	 */
+	@Deprecated
+	// use PasteHelper
+	public static final String[] getRows(final String fullContents) {
+		final String[] rows = fullContents.split(AXIS_SEPARATOR);
+		return rows;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the rows as string extractzed from the clipboard
+	 */
+	@Deprecated
+	// use PasteHelper
+	public static final String[] getRowsFromClipboard() {
+		final String clipboardContent = getClipboardContents();
+		if (clipboardContent != null && !clipboardContent.isEmpty()) {
+			return getRows(clipboardContent);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the columns as string extractzed from the clipboard
+	 */
+	@Deprecated
+	// use PasteHelper
+	public static final String[] getColumnsFromClipboard() {
+		final String clipboardContent = getClipboardContents();
+		if (clipboardContent != null && !clipboardContent.isEmpty()) {
+			return getColumns(clipboardContent);
+		}
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the clipboard contents used to build the command
+	 */
+	private static final String getClipboardContents() {
+		// examine system clipboard with AWT
+//		String bufferSystem = null;
+//
+//
+//		java.awt.datatransfer.Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+//
+//		if (clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {
+//			try {
+//				bufferSystem = clipboard.getData(DataFlavor.stringFlavor).toString();
+//			} catch (UnsupportedFlavorException e) {
+//				Activator.log.error(e);
+//			} catch (IOException e) {
+//				Activator.log.error(e);
+//			}
+//		}
+//
+//		return bufferSystem;
+
+//		 using SWT
+		 final Display display = Display.getCurrent();
+		 final Clipboard cb = new Clipboard(display);
+		 // we use the text transfert
+		 final TextTransfer transfer = TextTransfer.getInstance();
+		
+		// final Clipboard cb = new Clipboard(clipboard);
+		 final String contents = (String) cb.getContents(transfer);
+		
+		 return contents;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the contents of the clipboard
+	 */
+	public static final String getClipboardContentsAsString() {
+		return getClipboardContents();
+	}
+
+	/**
+	 *
+	 * @param row
+	 *            a row represented by a String
+	 * @return the cells for this row
+	 */
+	@Deprecated
+	// Use PasteHelpers#getCellsAsStringFromAxis
+	public static final String[] getCells(final String row) {
+		return row.split(CELL_SEPARATOR);
+	}
+
+
+	public static final String[] getColumns(final String fullContents) {
+		final String[] rows = fullContents.split(AXIS_SEPARATOR);
+		if (rows.length > 0) {
+			int nbColumn = rows[0].split(CELL_SEPARATOR).length;
+			String[] columns = new String[nbColumn];
+			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+				columns[columnIndex] = ""; //$NON-NLS-1$
+			}
+
+			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+				String row = rows[rowIndex];
+				String[] currentColumns = row.split(CELL_SEPARATOR);
+				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+					if (currentColumns.length != 0) {
+						columns[columnIndex] += currentColumns[columnIndex];
+					} else {
+						columns[columnIndex] += ""; //$NON-NLS-1$
+					}
+					if (rowIndex < rows.length + 1) {
+						columns[columnIndex] += CELL_SEPARATOR;
+					} else {
+						columns[columnIndex] += AXIS_SEPARATOR;
+					}
+				}
+			}
+			return columns;
+
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java
index c3afe13bc69..ea0cc7ab1f2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-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.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- *

- * Utils class to get the best editing domain to use

- *

- */

-public class TableEditingDomainUtils {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private TableEditingDomainUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the table

-	 *

-	 * @return

-	 * 		the EditingDomain associated to the table

-	 */

-	public static final TransactionalEditingDomain getTableEditingDomain(final Table table) {

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table);

-			return registry.getService(TransactionalEditingDomain.class);

-		} catch (final ServiceException e) {

-			// The table doesn't have an editing domain (e.g. the table is used in the properties view)

-			// Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the context

-	 *

-	 * @return

-	 * 		the EditingDomain associated to the context

-	 */

-	public static final TransactionalEditingDomain getTableContextEditingDomain(final Table table) {

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table.getContext());

-			return registry.getService(TransactionalEditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+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.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ *
+ * Utils class to get the best editing domain to use
+ *
+ */
+public class TableEditingDomainUtils {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private TableEditingDomainUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * Returns the EditingDomain associated to the table
+	 *
+	 * @return
+	 * 		the EditingDomain associated to the table
+	 */
+	public static final TransactionalEditingDomain getTableEditingDomain(final Table table) {
+		ServicesRegistry registry = null;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table);
+			return registry.getService(TransactionalEditingDomain.class);
+		} catch (final ServiceException e) {
+			// The table doesn't have an editing domain (e.g. the table is used in the properties view)
+			// Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);
+		}
+		return null;
+
+	}
+
+	/**
+	 * Returns the EditingDomain associated to the context
+	 *
+	 * @return
+	 * 		the EditingDomain associated to the context
+	 */
+	public static final TransactionalEditingDomain getTableContextEditingDomain(final Table table) {
+		ServicesRegistry registry = null;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table.getContext());
+			return registry.getService(TransactionalEditingDomain.class);
+		} catch (final ServiceException e) {
+			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
index ad41e54c7f6..801363123e4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * 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.utils;

-

-/**

- * the enumeration for the table region

- *

- *

- */

-public enum TableGridRegion {

-	AFTER_COLUMN_HEADER, AFTER_ROW_HEADER, ROW_HEADER, COLUMN_HEADER, CELL, UNKNOWN, CORNER;

-}

+/*****************************************************************************
+ * 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.utils;
+
+/**
+ * the enumeration for the table region
+ *
+ *
+ */
+public enum TableGridRegion {
+	AFTER_COLUMN_HEADER, AFTER_ROW_HEADER, ROW_HEADER, COLUMN_HEADER, CELL, UNKNOWN, CORNER;
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
index 6b7846fd7df..f710e4c2a55 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
@@ -1,139 +1,139 @@
-/*****************************************************************************

- * 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.utils;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Map;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;

-import org.eclipse.papyrus.infra.ui.util.SelectionHelper;

-

-/**

- * this class provides methods to get the table selection using the Eclipse ISelectioService, so the editor must have the focus

- *

- */

-public class TableSelectionHelper {

-

-	/**

-	 * 

-	 * @return

-	 *         the current table selection

-	 */

-	public static final TableStructuredSelection getCurrentTableStructuredSelection() {

-		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();

-		if (selection instanceof TableStructuredSelection) {

-			return (TableStructuredSelection) selection;

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         a map with the index and the object of the fully selected rows

-	 */

-	public static final Map<Integer, Object> getFullySelectedRows() {

-		TableStructuredSelection selection = getCurrentTableStructuredSelection();

-		if (selection != null) {

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);

-			if (wrapper != null) {

-				return wrapper.getFullySelectedRows();

-			}

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         a map with the index and the object of the fully selected columns

-	 */

-	public static final Map<Integer, Object> getFullySelectedColumns() {

-		TableStructuredSelection selection = getCurrentTableStructuredSelection();

-		if (selection != null) {

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);

-			if (wrapper != null) {

-				return wrapper.getFullySelectedColumns();

-			}

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the position coordinate of the selected cells, or <code>null</code>

-	 */

-	public static final Collection<PositionCoordinate> getSelectedCells() {

-		TableStructuredSelection selection = getCurrentTableStructuredSelection();

-		if (selection != null) {

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);

-			if (wrapper != null) {

-				return wrapper.getSelectedCells();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @param tableManager

-	 *            the tableManager for which we want the selected rows

-	 * @return

-	 *         a map with the index and the object of the fully selected rows

-	 */

-	public static final Map<Integer, Object> getFullySelectedRows(INattableModelManager tableManager) {

-		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);

-		if (wrapper != null) {

-			return wrapper.getFullySelectedRows();

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @param tableManager

-	 *            the tableManager for which we want the selected columns

-	 * 

-	 * @return

-	 *         a map with the index and the object of the fully selected columns

-	 */

-	public static final Map<Integer, Object> getFullySelectedColumns(INattableModelManager tableManager) {

-		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);

-		if (wrapper != null) {

-			return wrapper.getFullySelectedColumns();

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @param tableManager

-	 *            the tableManager for which we want the selected rows

-	 * @return

-	 *         the position coordinate of the selected cells, or <code>null</code>

-	 */

-	public static final Collection<PositionCoordinate> getSelectedCells(INattableModelManager tableManager) {

-		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);

-		if (wrapper != null) {

-			return wrapper.getSelectedCells();

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.utils;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;
+import org.eclipse.papyrus.infra.ui.util.SelectionHelper;
+
+/**
+ * this class provides methods to get the table selection using the Eclipse ISelectioService, so the editor must have the focus
+ *
+ */
+public class TableSelectionHelper {
+
+	/**
+	 * 
+	 * @return
+	 *         the current table selection
+	 */
+	public static final TableStructuredSelection getCurrentTableStructuredSelection() {
+		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();
+		if (selection instanceof TableStructuredSelection) {
+			return (TableStructuredSelection) selection;
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         a map with the index and the object of the fully selected rows
+	 */
+	public static final Map<Integer, Object> getFullySelectedRows() {
+		TableStructuredSelection selection = getCurrentTableStructuredSelection();
+		if (selection != null) {
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);
+			if (wrapper != null) {
+				return wrapper.getFullySelectedRows();
+			}
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         a map with the index and the object of the fully selected columns
+	 */
+	public static final Map<Integer, Object> getFullySelectedColumns() {
+		TableStructuredSelection selection = getCurrentTableStructuredSelection();
+		if (selection != null) {
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);
+			if (wrapper != null) {
+				return wrapper.getFullySelectedColumns();
+			}
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the position coordinate of the selected cells, or <code>null</code>
+	 */
+	public static final Collection<PositionCoordinate> getSelectedCells() {
+		TableStructuredSelection selection = getCurrentTableStructuredSelection();
+		if (selection != null) {
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);
+			if (wrapper != null) {
+				return wrapper.getSelectedCells();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @param tableManager
+	 *            the tableManager for which we want the selected rows
+	 * @return
+	 *         a map with the index and the object of the fully selected rows
+	 */
+	public static final Map<Integer, Object> getFullySelectedRows(INattableModelManager tableManager) {
+		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);
+		if (wrapper != null) {
+			return wrapper.getFullySelectedRows();
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @param tableManager
+	 *            the tableManager for which we want the selected columns
+	 * 
+	 * @return
+	 *         a map with the index and the object of the fully selected columns
+	 */
+	public static final Map<Integer, Object> getFullySelectedColumns(INattableModelManager tableManager) {
+		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);
+		if (wrapper != null) {
+			return wrapper.getFullySelectedColumns();
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @param tableManager
+	 *            the tableManager for which we want the selected rows
+	 * @return
+	 *         the position coordinate of the selected cells, or <code>null</code>
+	 */
+	public static final Collection<PositionCoordinate> getSelectedCells(INattableModelManager tableManager) {
+		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);
+		if (wrapper != null) {
+			return wrapper.getSelectedCells();
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
index bf0be1f71f2..aa50f1e6820 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
@@ -1,258 +1,258 @@
-/*****************************************************************************

- * 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.widget;

-

-import org.eclipse.nebula.widgets.nattable.style.IStyle;

-import org.eclipse.nebula.widgets.nattable.widget.NatCombo;

-import org.eclipse.papyrus.infra.nattable.celleditor.ButtonConfiguration;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- *

- * This widget provides a Combo with a button

- *

- */

-public class NatComboButton extends NatCombo {

-

-	/**

-	 * the configuration of the button

-	 */

-	private ButtonConfiguration buttonConfiguration;

-

-	/**

-	 * the button

-	 */

-	private Button button;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 */

-	public NatComboButton(Composite parent, IStyle cellStyle, int style, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, style);

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 */

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, maxVisibleItems, style);

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 * @deprecated freeEdit parameter is deprecated. Use the SWT.READ_ONLY flag to specify freeEdit = false

-	 */

-	@Deprecated

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, int style, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, maxVisibleItems, computeFreeEditStyle(freeEdit, style));

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	// NatCombo computes freeEdit from the style

-	// freeEdit == true <=> style | SWT.READ_ONLY = false

-	@Deprecated

-	private static int computeFreeEditStyle(boolean freeEdit, int style) {

-		if (freeEdit) {

-			return style & ~SWT.READ_ONLY;

-		} else {

-			return style | SWT.READ_ONLY;

-		}

-	}

-

-	@Deprecated

-	private static int computeMultiSelectStyle(boolean multiselect, int style) {

-		if (multiselect) {

-			return style | SWT.MULTI; // Add the SWT.MULTI style

-		} else {

-			return style & ~SWT.MULTI; // Remove the SWT.MULTI style

-		}

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 *

-	 * @deprecated multiselect parameter is deprecated. Use the SWT.MULTI flag instead

-	 */

-	@Deprecated

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, ButtonConfiguration buttonConfiguration) {

-		this(parent, cellStyle, maxVisibleItems, multiselect, computeMultiSelectStyle(multiselect, style), buttonConfiguration);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int, Image)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param style

-	 * @param iconImage

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 *

-	 * @deprecated The freeEdit and multiselect parameter. Use the SWT.READ_ONLY flag to specify freeEdit = False. Use SWT.MULTI flag to specify

-	 *             multiselect = True

-	 */

-	@Deprecated

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {

-		this(parent, cellStyle, maxVisibleItems, computeMultiSelectStyle(multiselect, computeFreeEditStyle(freeEdit, style)), buttonConfiguration);

-	}

-

-	/**

-	 * Constructor

-	 *

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param style

-	 * @param iconImage

-	 * @param buttonConfiguration

-	 */

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, maxVisibleItems, style, iconImage);

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	/**

-	 * Configure the created button

-	 */

-	protected void configureButton() {

-		final String txt = buttonConfiguration.getText();

-		if (txt != null) {

-			button.setText(txt);

-		}

-		final String toolTip = buttonConfiguration.getTooltipText();

-		if (toolTip != null) {

-			button.setToolTipText(toolTip);

-		}

-

-		final Image img = buttonConfiguration.getImage();

-		if (img != null) {

-			button.setImage(img);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#createTextControl(int)

-	 *

-	 * @param style

-	 */

-	@Override

-	protected void createTextControl(int style) {

-		super.createTextControl(style);

-		createButton();

-		// we change the layout because there is 3 elements now!

-		GridLayout gridLayout = new GridLayout(3, false);

-		gridLayout.marginWidth = 0;

-		gridLayout.marginHeight = 0;

-		gridLayout.horizontalSpacing = 0;

-		setLayout(gridLayout);

-	}

-

-	protected void createButton() {

-		button = new Button(this, SWT.NONE);

-

-

-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, true);

-		button.setLayoutData(gridData);

-		button.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				runAction();

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		});

-

-	}

-

-	/**

-	 * execute the action done by the button

-	 */

-	protected void runAction() {

-		buttonConfiguration.getAction().run();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		buttonConfiguration = null;

-		button = 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.widget;
+
+import org.eclipse.nebula.widgets.nattable.style.IStyle;
+import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
+import org.eclipse.papyrus.infra.nattable.celleditor.ButtonConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ *
+ * This widget provides a Combo with a button
+ *
+ */
+public class NatComboButton extends NatCombo {
+
+	/**
+	 * the configuration of the button
+	 */
+	private ButtonConfiguration buttonConfiguration;
+
+	/**
+	 * the button
+	 */
+	private Button button;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 */
+	public NatComboButton(Composite parent, IStyle cellStyle, int style, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, style);
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 */
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, maxVisibleItems, style);
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 * @deprecated freeEdit parameter is deprecated. Use the SWT.READ_ONLY flag to specify freeEdit = false
+	 */
+	@Deprecated
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, int style, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, maxVisibleItems, computeFreeEditStyle(freeEdit, style));
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	// NatCombo computes freeEdit from the style
+	// freeEdit == true <=> style | SWT.READ_ONLY = false
+	@Deprecated
+	private static int computeFreeEditStyle(boolean freeEdit, int style) {
+		if (freeEdit) {
+			return style & ~SWT.READ_ONLY;
+		} else {
+			return style | SWT.READ_ONLY;
+		}
+	}
+
+	@Deprecated
+	private static int computeMultiSelectStyle(boolean multiselect, int style) {
+		if (multiselect) {
+			return style | SWT.MULTI; // Add the SWT.MULTI style
+		} else {
+			return style & ~SWT.MULTI; // Remove the SWT.MULTI style
+		}
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 *
+	 * @deprecated multiselect parameter is deprecated. Use the SWT.MULTI flag instead
+	 */
+	@Deprecated
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, ButtonConfiguration buttonConfiguration) {
+		this(parent, cellStyle, maxVisibleItems, multiselect, computeMultiSelectStyle(multiselect, style), buttonConfiguration);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int, Image)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param style
+	 * @param iconImage
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 *
+	 * @deprecated The freeEdit and multiselect parameter. Use the SWT.READ_ONLY flag to specify freeEdit = False. Use SWT.MULTI flag to specify
+	 *             multiselect = True
+	 */
+	@Deprecated
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {
+		this(parent, cellStyle, maxVisibleItems, computeMultiSelectStyle(multiselect, computeFreeEditStyle(freeEdit, style)), buttonConfiguration);
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param style
+	 * @param iconImage
+	 * @param buttonConfiguration
+	 */
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, maxVisibleItems, style, iconImage);
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	/**
+	 * Configure the created button
+	 */
+	protected void configureButton() {
+		final String txt = buttonConfiguration.getText();
+		if (txt != null) {
+			button.setText(txt);
+		}
+		final String toolTip = buttonConfiguration.getTooltipText();
+		if (toolTip != null) {
+			button.setToolTipText(toolTip);
+		}
+
+		final Image img = buttonConfiguration.getImage();
+		if (img != null) {
+			button.setImage(img);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#createTextControl(int)
+	 *
+	 * @param style
+	 */
+	@Override
+	protected void createTextControl(int style) {
+		super.createTextControl(style);
+		createButton();
+		// we change the layout because there is 3 elements now!
+		GridLayout gridLayout = new GridLayout(3, false);
+		gridLayout.marginWidth = 0;
+		gridLayout.marginHeight = 0;
+		gridLayout.horizontalSpacing = 0;
+		setLayout(gridLayout);
+	}
+
+	protected void createButton() {
+		button = new Button(this, SWT.NONE);
+
+
+		GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, true);
+		button.setLayoutData(gridData);
+		button.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				runAction();
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+
+	}
+
+	/**
+	 * execute the action done by the button
+	 */
+	protected void runAction() {
+		buttonConfiguration.getAction().run();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		buttonConfiguration = null;
+		button = null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
index b7144c5dc5e..fcf59a09366 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * 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 org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.tools.util.TypeUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- *         This class is not in the API

- */

-public class CategoriesWizardUtils {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private CategoriesWizardUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         <code>true</code> if the axis represents a root element

-	 */

-	public static final boolean isRootItem(ITreeItemAxis axis) {

-		return axis.getParent() == null;

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         <code>true</code> if the axis represents a depth

-	 */

-	public static final boolean isDepthItem(ITreeItemAxis axis) {

-		if (axis instanceof IdTreeItemAxis) {

-			String element = ((IdTreeItemAxis) axis).getElement();

-			return TypeUtils.isNaturalValue(element);

-		}

-		return false;

-	}

-

-	/**

-	 * @param axis

-	 * @returnplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java

-	 *                                                                                                                                           <code>true</code> if the axis represents a category item

-	 */

-	public static boolean isCategoryItem(ITreeItemAxis axis) {

-		return !(isDepthItem(axis) || isRootItem(axis));

-	}

-

-}

+/*****************************************************************************
+ * 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 org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ *         This class is not in the API
+ */
+public class CategoriesWizardUtils {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private CategoriesWizardUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         <code>true</code> if the axis represents a root element
+	 */
+	public static final boolean isRootItem(ITreeItemAxis axis) {
+		return axis.getParent() == null;
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         <code>true</code> if the axis represents a depth
+	 */
+	public static final boolean isDepthItem(ITreeItemAxis axis) {
+		if (axis instanceof IdTreeItemAxis) {
+			String element = ((IdTreeItemAxis) axis).getElement();
+			return TypeUtils.isNaturalValue(element);
+		}
+		return false;
+	}
+
+	/**
+	 * @param axis
+	 * @returnplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
+	 *                                                                                                                                           <code>true</code> if the axis represents a category item
+	 */
+	public static boolean isCategoryItem(ITreeItemAxis axis) {
+		return !(isDepthItem(axis) || isRootItem(axis));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
index 5d8447f07ec..2fb75a4986f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
@@ -1,732 +1,732 @@
-/*****************************************************************************

- * 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.pages;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.factory.IAxisFactory;

-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.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * @author Vincent Lorenzo

- *

- *         This widget allows to choose the categories to listen in the table

- *         In the left part, we display multivalued features

- *         In the right part, we display a tree :

- *         <ul>

- *         <li>first level : the root of the table</li>

- *         <li>the depth</li>

- *         <li>the feature to listen</li>

- *         <li></li>

- *         </ul>

- * 

- *         The create action allows to create new depth

- */

-public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelectionWidget {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector) {

-		super(selector);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique) {

-		super(selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {

-		super(selector, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		super(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#init()

-	 *

-	 */

-	@Override

-	protected void init() {

-		setFactory(new CategoriesValueFactory());

-		setAllowEdition(true);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#getSelection()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<Object> getSelection() {

-		return new ArrayList<Object>(this.initialSelection);

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the context object to use

-	 */

-	protected Object getContextForCreateAction() {

-		if (this.selectedElementsViewer != null) {

-			ISelection selection = this.selectedElementsViewer.getSelection();

-			if (selection instanceof IStructuredSelection) {

-				Object first = ((IStructuredSelection) selection).getFirstElement();

-				if (first instanceof ITreeItemAxis) {

-					ITreeItemAxis context = (ITreeItemAxis) first;

-					while (((ITreeItemAxis) context).getParent() != null) {

-						context = ((ITreeItemAxis) context).getParent();

-					}

-					return context;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createAction()

-	 *

-	 */

-	@Override

-	protected void createAction() {

-		Object context = getContextForCreateAction();

-		if (factory == null || context == null) {

-			return;

-		}

-		try {

-			factory.createObject(this.create, context);

-		} catch (OperationCanceledException e) {

-			// The user cancelled and we rolled back pending model changes

-		}

-		if (!this.selectedElementsViewer.getExpandedState(context)) {

-			this.selectedElementsViewer.setExpandedElements(new Object[] { context });

-		}

-		this.selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#edit()

-	 *

-	 */

-	@Override

-	protected void edit() {

-		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();

-		if (selectedAxis.size() == 1 && CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0))) {

-			this.factory.edit(this.edit, selectedAxis.get(0));

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#canEdit()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit() {

-		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();

-		if (selectedAxis.size() == 1) {

-			return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));

-		}

-		return false;

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createListSectionContentProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	protected IContentProvider createListSectionContentProvider() {

-		return new ITreeItemContentProvider() {

-			/**

-			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#getChildren(java.lang.Object)

-			 *

-			 * @param arg0

-			 * @return

-			 */

-			@Override

-			public Object[] getChildren(Object arg0) {

-				return super.getChildren(arg0);

-			}

-

-			/**

-			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#hasChildren(java.lang.Object)

-			 *

-			 * @param arg0

-			 * @return

-			 */

-			@Override

-			public boolean hasChildren(Object arg0) {

-				if (arg0 instanceof ITreeItemAxis && CategoriesWizardUtils.isCategoryItem((ITreeItemAxis) arg0)) {

-					return false;

-				}

-				return super.hasChildren(arg0);

-			}

-		};

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#upAction()

-	 *

-	 */

-	@Override

-	protected void upAction() {

-		moveAction(true);

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the selected axis in the selectedElementsViewer

-	 */

-	protected List<ITreeItemAxis> getSelectedAxisInSelectedElementsViewer() {

-		if (selectedElementsViewer != null && selectedElementsViewer.getSelection() instanceof IStructuredSelection) {

-			List<ITreeItemAxis> selection = new ArrayList<ITreeItemAxis>();

-			for (Object curr : ((IStructuredSelection) selectedElementsViewer.getSelection()).toList()) {

-				if (curr instanceof ITreeItemAxis) {

-					selection.add((ITreeItemAxis) curr);

-				}

-			}

-			return selection;

-		}

-		return Collections.emptyList();

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the list with the current selection in the viewer.

-	 *         <ul>

-	 *         <li>if roots are in the selection, we returns only axis representing roots</li>

-	 *         <li>we returns only axis representing FillingCategories</li>

-	 * 

-	 *         </ul>

-	 * 

-	 */

-	protected List<ITreeItemAxis> getConsistentSelectionInSelectedElementsViewer() {

-		if (selectedElementsViewer == null) {

-			return Collections.emptyList();

-		}

-		ISelection tmp = selectedElementsViewer.getSelection();

-		if (tmp instanceof IStructuredSelection) {

-			IStructuredSelection selection = (IStructuredSelection) tmp;

-			List<ITreeItemAxis> fillingAxis = new ArrayList<ITreeItemAxis>();

-			List<ITreeItemAxis> rootAxis = new ArrayList<ITreeItemAxis>();

-			for (Object current : selection.toList()) {

-				if (current instanceof ITreeItemAxis) {

-					ITreeItemAxis axis = (ITreeItemAxis) current;

-					if (axis.getParent() == null) {

-						rootAxis.add(axis);

-					} else if (rootAxis.isEmpty() && axis.getElement() instanceof String) {

-						fillingAxis.add(axis);

-					}

-				}

-			}

-			if (rootAxis.isEmpty()) {

-				return fillingAxis;

-			}

-			return rootAxis;

-

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * 

-	 * @param wantedClass

-	 *            the class represented the wanted type of the encapsulated element

-	 * @return

-	 *         the list of wanted {@link ITreeItemAxis} which encapsulate elements instance of the wanted class

-	 */

-	protected List<ITreeItemAxis> getSelectedFillingConfigurantionInSelectedElementsViewer() {

-		List<ITreeItemAxis> axis = getConsistentSelectionInSelectedElementsViewer();

-		if (!axis.isEmpty() && axis.get(0).getElement() instanceof TreeFillingConfiguration) {

-			return axis;

-		}

-		return Collections.emptyList();

-	}

-

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#deleteAction()

-	 *

-	 */

-	@Override

-	protected void deleteAction() {

-		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();

-		label: for (ITreeItemAxis current : axis) {

-			if (CategoriesWizardUtils.isDepthItem(current)) {

-				int depth = Integer.valueOf((String) current.getElement());

-				if (depth == 0) {

-					continue label;

-				}

-			}

-			if (current.getParent() != null) {

-				current.setParent(null);

-				EcoreUtil.delete(current);

-			}

-		}

-		selectedElementsViewer.refresh();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canRemove()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canRemove() {

-		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();

-		for (ITreeItemAxis current : axis) {

-			if (!CategoriesWizardUtils.isCategoryItem(current)) {

-				return false;

-			}

-		}

-		return super.canRemove();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canDelete()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canDelete() {

-		for (ITreeItemAxis curr : getSelectionInSelectedElementsViewer()) {

-			if (!(CategoriesWizardUtils.isDepthItem(curr) || CategoriesWizardUtils.isCategoryItem(curr))) {

-				return false;

-			}

-			// we can't delete the 0 depth

-			if (CategoriesWizardUtils.isDepthItem(curr)) {

-				int depth = Integer.valueOf((String) curr.getElement());

-				if (depth == 0) {

-					return false;

-				}

-			}

-		}

-		return true;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canAdd()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canAdd() {

-		return isCategorySelection() || isRootSelection();

-	}

-

-	protected boolean isRootSelection() {

-		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();

-		for (ITreeItemAxis curr : axis) {

-			if (!CategoriesWizardUtils.isRootItem(curr)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	protected boolean isCategorySelection() {

-		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();

-		for (ITreeItemAxis curr : axis) {

-			if (!CategoriesWizardUtils.isDepthItem(curr)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         <ul>

-	 *         <li>a list with the selected categories only when all selected elements are categories AND they have the same parent (a {@link IdTreeItemAxis} (which represents the depth))</li>

-	 *         <li>an empty list in all others case</li>

-	 *         </ul>

-	 * 

-	 */

-	protected List<ITreeItemAxis> getSelectedCategoriesInSelectedElementsViewer() {

-		List<ITreeItemAxis> selection = getSelectedAxisInSelectedElementsViewer();

-		ITreeItemAxis parent = null;

-		List<ITreeItemAxis> returnedSelection = new ArrayList<ITreeItemAxis>();

-		for (ITreeItemAxis curr : selection) {

-			ITreeItemAxis tmp = curr.getParent();

-			if (tmp == null) {

-				return Collections.emptyList();

-			}

-			if (parent == null && tmp instanceof IdTreeItemAxis) {

-				parent = tmp;

-				returnedSelection.add(curr);

-			} else if (parent != null && parent == tmp) {

-				returnedSelection.add(curr);

-			} else {

-				return Collections.emptyList();

-			}

-		}

-		return returnedSelection;

-	}

-

-	/**

-	 * 

-	 * @author Vincent Lorenzo

-	 * 

-	 *         This comparator allows to sort comparator

-	 *

-	 */

-	public static final class CategoriesComparator implements Comparator<ITreeItemAxis> {

-

-		private List<ITreeItemAxis> children;

-

-		/**

-		 * Constructor.

-		 *

-		 */

-		public CategoriesComparator(List<ITreeItemAxis> children) {

-			this.children = Collections.unmodifiableList(children);

-		}

-

-		/**

-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-		 *

-		 * @param o1

-		 * @param o2

-		 * @return

-		 */

-		@Override

-		public int compare(ITreeItemAxis o1, ITreeItemAxis o2) {

-			int index1 = children.indexOf(o1);

-			int index2 = children.indexOf(o2);

-			if (index1 < index2) {

-				return -1;

-			}

-			return 1;

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#downAction()

-	 *

-	 */

-	@Override

-	protected void downAction() {

-		moveAction(false);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canMove(boolean)

-	 *

-	 * @param up

-	 * @return

-	 */

-	protected boolean canMove(boolean up) {

-		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();

-		if (categories.isEmpty()) {

-			return false;

-		}

-		ITreeItemAxis parent = categories.get(0).getParent();

-		List<ITreeItemAxis> children = parent.getChildren();

-		int forbiddenIndex = up ? 0 : children.size() - 1;

-

-		for (ITreeItemAxis child : categories) {

-			if (children.indexOf(child) == forbiddenIndex) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @param up

-	 *            <code>true</code> if the elements must be move to up

-	 */

-	protected void moveAction(boolean up) {

-		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();

-

-		ITreeItemAxis parent = categories.get(0).getParent();

-		final List<ITreeItemAxis> children = Collections.unmodifiableList(parent.getChildren());

-		if (categories.isEmpty()) {

-			return;

-		}

-

-		Collections.sort(categories, new CategoriesComparator(children));

-		if (!up) {

-			Collections.reverse(categories);

-		}

-		for (ITreeItemAxis child : categories) {

-			int index = parent.getChildren().indexOf(child);

-			index = up ? index - 1 : index + 1;

-			parent.getChildren().move(index, child);

-		}

-		selectedElementsViewer.refresh();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#addElements(java.lang.Object[])

-	 *

-	 * @param elements

-	 */

-	@Override

-	public void addElements(Object[] elements) {

-		List<ITreeItemAxis> selectedElements = getSelectedAxisInSelectedElementsViewer();

-		if (selectedElements.isEmpty()) {

-			return;

-		}

-

-		// 1. verify if the root is selected

-		ITreeItemAxis root = null;

-		for (ITreeItemAxis current : selectedElements) {

-			if (CategoriesWizardUtils.isRootItem(current)) {

-				root = current;

-				break;

-			}

-		}

-		// 2. find the categories to edit

-		List<ITreeItemAxis> depthToEdit = new ArrayList<ITreeItemAxis>();

-		if (root != null) {

-			depthToEdit.addAll(root.getChildren());

-		} else {

-			for (ITreeItemAxis current : selectedElements) {

-				if (CategoriesWizardUtils.isDepthItem(current)) {

-					depthToEdit.add(current);

-				}

-			}

-		}

-

-		// 3. edit the categories

-		for (ITreeItemAxis curr : depthToEdit) {

-			List<Object> alreadyManagedObject = new ArrayList<Object>();

-			for (ITreeItemAxis category : curr.getChildren()) {

-				alreadyManagedObject.add(category.getElement());

-			}

-

-			for (Object el : elements) {

-				if (!alreadyManagedObject.contains(el)) {

-					IAxisFactory.createITreeItemAxis(curr, el, null, null);

-				}

-

-			}

-		}

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#removeAllAction()

-	 *

-	 */

-	@Override

-	protected void removeAllAction() {

-		Object input = this.selectedElementsViewer.getInput();

-		if (input instanceof List<?>) {

-			for (Object curr : (List<?>) input) {

-				if (curr instanceof ITreeItemAxis) {

-					destroyCategoriesAxis((ITreeItemAxis) curr);

-				}

-			}

-			this.selectedElementsViewer.refresh();

-		}

-	}

-

-	/**

-	 * Destroy recursively all categories axis

-	 * 

-	 * @param axis

-	 *            an axis

-	 */

-	protected void destroyCategoriesAxis(ITreeItemAxis axis) {

-		for (ITreeItemAxis child : axis.getChildren()) {

-			destroyCategoriesAxis(child);

-		}

-		if (CategoriesWizardUtils.isCategoryItem(axis)) {

-			axis.setParent(null);

-			EcoreUtil.delete(axis);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#removeAction()

-	 *

-	 */

-	@Override

-	protected void removeAction() {

-		IStructuredSelection selection = (IStructuredSelection) this.selectedElementsViewer.getSelection();

-		for (Object current : selection.toList()) {

-			if (current instanceof ITreeItemAxis && ((ITreeItemAxis) current).getParent() != null) {

-				ITreeItemAxis axis = (ITreeItemAxis) current;

-				axis.setParent(null);

-				EcoreUtil.delete(axis);

-			}

-		}

-		this.selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the list of the selected element in the selection viewer

-	 */

-	protected List<ITreeItemAxis> getSelectionInSelectedElementsViewer() {

-		if (this.selectedElementsViewer != null) {

-			ISelection selection = this.selectedElementsViewer.getSelection();

-			if (selection instanceof IStructuredSelection) {

-				List<ITreeItemAxis> returnedValues = new ArrayList<ITreeItemAxis>();

-				for (Object current : ((IStructuredSelection) selection).toList()) {

-					if (current instanceof ITreeItemAxis) {

-						returnedValues.add((ITreeItemAxis) current);

-					}

-				}

-				return returnedValues;

-			}

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * 

-	 * @author Vincent Lorenzo

-	 *         This class is the factory used to create new ITreeItemAxis in the viewer of selected element

-	 *         It creates only {@link ITreeItemAxis} to represents depth to configure and its allows to edit only alias of categories

-	 */

-	public class CategoriesValueFactory implements ReferenceValueFactory {

-		/**

-		 * 

-		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#validateObjects(java.util.Collection)

-		 *

-		 * @param objectsToValidate

-		 * @return

-		 */

-		@Override

-		public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {

-			return null;

-		}

-

-		/**

-		 * 

-		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#edit(org.eclipse.swt.widgets.Control, java.lang.Object)

-		 *

-		 * @param widget

-		 * @param object

-		 * @return

-		 */

-		@Override

-		public Object edit(Control widget, Object object) {

-			String existingAlias = ((IAxis) object).getAlias();

-			InputDialog dialog = new InputDialog(widget.getShell(), Messages.ChooseCategoriesSelectionWidget_EditAlias, Messages.ChooseCategoriesSelectionWidget_EnterAliasToUseForTheCategory, existingAlias, null);

-

-			int result = dialog.open();

-			if (result == Window.OK) {

-				String newValue = dialog.getText();

-				((IAxis) object).setAlias(newValue);

-			}

-

-			return object;

-		}

-

-		@Override

-		public Object createObject(Control widget, Object context) {

-			Assert.isTrue(context instanceof ITreeItemAxis);

-			ITreeItemAxis rootItem = (ITreeItemAxis) context;

-			Assert.isTrue(rootItem.getParent() == null);

-

-			// find the maxDepth

-			int maxDepth = -1;

-			for (ITreeItemAxis axis : rootItem.getChildren()) {

-				Assert.isTrue(axis instanceof IdTreeItemAxis);

-				maxDepth = Math.max(maxDepth, Integer.parseInt((String) axis.getElement()));

-			}

-			int nextDepth = maxDepth + 1;

-			return IAxisFactory.createITreeItemAxis(rootItem, Integer.valueOf(nextDepth), null, null);

-		}

-

-		/**

-		 * 

-		 * @return

-		 */

-		@Override

-		public boolean canEdit() {

-			List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();

-			if (selectedAxis.size() == 1) {

-				return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));

-			}

-			return false;

-		}

-

-		/**

-		 * 

-		 * @return

-		 */

-		@Override

-		public boolean canCreateObject() {

-			return getContextForCreateAction() != null;

-		}

-	}

-}

+/*****************************************************************************
+ * 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.pages;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.factory.IAxisFactory;
+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.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ *         This widget allows to choose the categories to listen in the table
+ *         In the left part, we display multivalued features
+ *         In the right part, we display a tree :
+ *         <ul>
+ *         <li>first level : the root of the table</li>
+ *         <li>the depth</li>
+ *         <li>the feature to listen</li>
+ *         <li></li>
+ *         </ul>
+ * 
+ *         The create action allows to create new depth
+ */
+public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelectionWidget {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector) {
+		super(selector);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique) {
+		super(selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {
+		super(selector, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		super(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#init()
+	 *
+	 */
+	@Override
+	protected void init() {
+		setFactory(new CategoriesValueFactory());
+		setAllowEdition(true);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#getSelection()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Object> getSelection() {
+		return new ArrayList<Object>(this.initialSelection);
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the context object to use
+	 */
+	protected Object getContextForCreateAction() {
+		if (this.selectedElementsViewer != null) {
+			ISelection selection = this.selectedElementsViewer.getSelection();
+			if (selection instanceof IStructuredSelection) {
+				Object first = ((IStructuredSelection) selection).getFirstElement();
+				if (first instanceof ITreeItemAxis) {
+					ITreeItemAxis context = (ITreeItemAxis) first;
+					while (((ITreeItemAxis) context).getParent() != null) {
+						context = ((ITreeItemAxis) context).getParent();
+					}
+					return context;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createAction()
+	 *
+	 */
+	@Override
+	protected void createAction() {
+		Object context = getContextForCreateAction();
+		if (factory == null || context == null) {
+			return;
+		}
+		try {
+			factory.createObject(this.create, context);
+		} catch (OperationCanceledException e) {
+			// The user cancelled and we rolled back pending model changes
+		}
+		if (!this.selectedElementsViewer.getExpandedState(context)) {
+			this.selectedElementsViewer.setExpandedElements(new Object[] { context });
+		}
+		this.selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#edit()
+	 *
+	 */
+	@Override
+	protected void edit() {
+		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();
+		if (selectedAxis.size() == 1 && CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0))) {
+			this.factory.edit(this.edit, selectedAxis.get(0));
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#canEdit()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canEdit() {
+		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();
+		if (selectedAxis.size() == 1) {
+			return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));
+		}
+		return false;
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createListSectionContentProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	protected IContentProvider createListSectionContentProvider() {
+		return new ITreeItemContentProvider() {
+			/**
+			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#getChildren(java.lang.Object)
+			 *
+			 * @param arg0
+			 * @return
+			 */
+			@Override
+			public Object[] getChildren(Object arg0) {
+				return super.getChildren(arg0);
+			}
+
+			/**
+			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#hasChildren(java.lang.Object)
+			 *
+			 * @param arg0
+			 * @return
+			 */
+			@Override
+			public boolean hasChildren(Object arg0) {
+				if (arg0 instanceof ITreeItemAxis && CategoriesWizardUtils.isCategoryItem((ITreeItemAxis) arg0)) {
+					return false;
+				}
+				return super.hasChildren(arg0);
+			}
+		};
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#upAction()
+	 *
+	 */
+	@Override
+	protected void upAction() {
+		moveAction(true);
+	}
+
+
+	/**
+	 * 
+	 * @return
+	 *         the selected axis in the selectedElementsViewer
+	 */
+	protected List<ITreeItemAxis> getSelectedAxisInSelectedElementsViewer() {
+		if (selectedElementsViewer != null && selectedElementsViewer.getSelection() instanceof IStructuredSelection) {
+			List<ITreeItemAxis> selection = new ArrayList<ITreeItemAxis>();
+			for (Object curr : ((IStructuredSelection) selectedElementsViewer.getSelection()).toList()) {
+				if (curr instanceof ITreeItemAxis) {
+					selection.add((ITreeItemAxis) curr);
+				}
+			}
+			return selection;
+		}
+		return Collections.emptyList();
+	}
+
+
+	/**
+	 * 
+	 * @return
+	 *         the list with the current selection in the viewer.
+	 *         <ul>
+	 *         <li>if roots are in the selection, we returns only axis representing roots</li>
+	 *         <li>we returns only axis representing FillingCategories</li>
+	 * 
+	 *         </ul>
+	 * 
+	 */
+	protected List<ITreeItemAxis> getConsistentSelectionInSelectedElementsViewer() {
+		if (selectedElementsViewer == null) {
+			return Collections.emptyList();
+		}
+		ISelection tmp = selectedElementsViewer.getSelection();
+		if (tmp instanceof IStructuredSelection) {
+			IStructuredSelection selection = (IStructuredSelection) tmp;
+			List<ITreeItemAxis> fillingAxis = new ArrayList<ITreeItemAxis>();
+			List<ITreeItemAxis> rootAxis = new ArrayList<ITreeItemAxis>();
+			for (Object current : selection.toList()) {
+				if (current instanceof ITreeItemAxis) {
+					ITreeItemAxis axis = (ITreeItemAxis) current;
+					if (axis.getParent() == null) {
+						rootAxis.add(axis);
+					} else if (rootAxis.isEmpty() && axis.getElement() instanceof String) {
+						fillingAxis.add(axis);
+					}
+				}
+			}
+			if (rootAxis.isEmpty()) {
+				return fillingAxis;
+			}
+			return rootAxis;
+
+		}
+		return Collections.emptyList();
+	}
+
+	/**
+	 * 
+	 * @param wantedClass
+	 *            the class represented the wanted type of the encapsulated element
+	 * @return
+	 *         the list of wanted {@link ITreeItemAxis} which encapsulate elements instance of the wanted class
+	 */
+	protected List<ITreeItemAxis> getSelectedFillingConfigurantionInSelectedElementsViewer() {
+		List<ITreeItemAxis> axis = getConsistentSelectionInSelectedElementsViewer();
+		if (!axis.isEmpty() && axis.get(0).getElement() instanceof TreeFillingConfiguration) {
+			return axis;
+		}
+		return Collections.emptyList();
+	}
+
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#deleteAction()
+	 *
+	 */
+	@Override
+	protected void deleteAction() {
+		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();
+		label: for (ITreeItemAxis current : axis) {
+			if (CategoriesWizardUtils.isDepthItem(current)) {
+				int depth = Integer.valueOf((String) current.getElement());
+				if (depth == 0) {
+					continue label;
+				}
+			}
+			if (current.getParent() != null) {
+				current.setParent(null);
+				EcoreUtil.delete(current);
+			}
+		}
+		selectedElementsViewer.refresh();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canRemove()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canRemove() {
+		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();
+		for (ITreeItemAxis current : axis) {
+			if (!CategoriesWizardUtils.isCategoryItem(current)) {
+				return false;
+			}
+		}
+		return super.canRemove();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canDelete()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canDelete() {
+		for (ITreeItemAxis curr : getSelectionInSelectedElementsViewer()) {
+			if (!(CategoriesWizardUtils.isDepthItem(curr) || CategoriesWizardUtils.isCategoryItem(curr))) {
+				return false;
+			}
+			// we can't delete the 0 depth
+			if (CategoriesWizardUtils.isDepthItem(curr)) {
+				int depth = Integer.valueOf((String) curr.getElement());
+				if (depth == 0) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canAdd()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canAdd() {
+		return isCategorySelection() || isRootSelection();
+	}
+
+	protected boolean isRootSelection() {
+		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();
+		for (ITreeItemAxis curr : axis) {
+			if (!CategoriesWizardUtils.isRootItem(curr)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	protected boolean isCategorySelection() {
+		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();
+		for (ITreeItemAxis curr : axis) {
+			if (!CategoriesWizardUtils.isDepthItem(curr)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * 
+	 * @return
+	 *         <ul>
+	 *         <li>a list with the selected categories only when all selected elements are categories AND they have the same parent (a {@link IdTreeItemAxis} (which represents the depth))</li>
+	 *         <li>an empty list in all others case</li>
+	 *         </ul>
+	 * 
+	 */
+	protected List<ITreeItemAxis> getSelectedCategoriesInSelectedElementsViewer() {
+		List<ITreeItemAxis> selection = getSelectedAxisInSelectedElementsViewer();
+		ITreeItemAxis parent = null;
+		List<ITreeItemAxis> returnedSelection = new ArrayList<ITreeItemAxis>();
+		for (ITreeItemAxis curr : selection) {
+			ITreeItemAxis tmp = curr.getParent();
+			if (tmp == null) {
+				return Collections.emptyList();
+			}
+			if (parent == null && tmp instanceof IdTreeItemAxis) {
+				parent = tmp;
+				returnedSelection.add(curr);
+			} else if (parent != null && parent == tmp) {
+				returnedSelection.add(curr);
+			} else {
+				return Collections.emptyList();
+			}
+		}
+		return returnedSelection;
+	}
+
+	/**
+	 * 
+	 * @author Vincent Lorenzo
+	 * 
+	 *         This comparator allows to sort comparator
+	 *
+	 */
+	public static final class CategoriesComparator implements Comparator<ITreeItemAxis> {
+
+		private List<ITreeItemAxis> children;
+
+		/**
+		 * Constructor.
+		 *
+		 */
+		public CategoriesComparator(List<ITreeItemAxis> children) {
+			this.children = Collections.unmodifiableList(children);
+		}
+
+		/**
+		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+		 *
+		 * @param o1
+		 * @param o2
+		 * @return
+		 */
+		@Override
+		public int compare(ITreeItemAxis o1, ITreeItemAxis o2) {
+			int index1 = children.indexOf(o1);
+			int index2 = children.indexOf(o2);
+			if (index1 < index2) {
+				return -1;
+			}
+			return 1;
+		}
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#downAction()
+	 *
+	 */
+	@Override
+	protected void downAction() {
+		moveAction(false);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canMove(boolean)
+	 *
+	 * @param up
+	 * @return
+	 */
+	protected boolean canMove(boolean up) {
+		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();
+		if (categories.isEmpty()) {
+			return false;
+		}
+		ITreeItemAxis parent = categories.get(0).getParent();
+		List<ITreeItemAxis> children = parent.getChildren();
+		int forbiddenIndex = up ? 0 : children.size() - 1;
+
+		for (ITreeItemAxis child : categories) {
+			if (children.indexOf(child) == forbiddenIndex) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * 
+	 * @param up
+	 *            <code>true</code> if the elements must be move to up
+	 */
+	protected void moveAction(boolean up) {
+		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();
+
+		ITreeItemAxis parent = categories.get(0).getParent();
+		final List<ITreeItemAxis> children = Collections.unmodifiableList(parent.getChildren());
+		if (categories.isEmpty()) {
+			return;
+		}
+
+		Collections.sort(categories, new CategoriesComparator(children));
+		if (!up) {
+			Collections.reverse(categories);
+		}
+		for (ITreeItemAxis child : categories) {
+			int index = parent.getChildren().indexOf(child);
+			index = up ? index - 1 : index + 1;
+			parent.getChildren().move(index, child);
+		}
+		selectedElementsViewer.refresh();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#addElements(java.lang.Object[])
+	 *
+	 * @param elements
+	 */
+	@Override
+	public void addElements(Object[] elements) {
+		List<ITreeItemAxis> selectedElements = getSelectedAxisInSelectedElementsViewer();
+		if (selectedElements.isEmpty()) {
+			return;
+		}
+
+		// 1. verify if the root is selected
+		ITreeItemAxis root = null;
+		for (ITreeItemAxis current : selectedElements) {
+			if (CategoriesWizardUtils.isRootItem(current)) {
+				root = current;
+				break;
+			}
+		}
+		// 2. find the categories to edit
+		List<ITreeItemAxis> depthToEdit = new ArrayList<ITreeItemAxis>();
+		if (root != null) {
+			depthToEdit.addAll(root.getChildren());
+		} else {
+			for (ITreeItemAxis current : selectedElements) {
+				if (CategoriesWizardUtils.isDepthItem(current)) {
+					depthToEdit.add(current);
+				}
+			}
+		}
+
+		// 3. edit the categories
+		for (ITreeItemAxis curr : depthToEdit) {
+			List<Object> alreadyManagedObject = new ArrayList<Object>();
+			for (ITreeItemAxis category : curr.getChildren()) {
+				alreadyManagedObject.add(category.getElement());
+			}
+
+			for (Object el : elements) {
+				if (!alreadyManagedObject.contains(el)) {
+					IAxisFactory.createITreeItemAxis(curr, el, null, null);
+				}
+
+			}
+		}
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#removeAllAction()
+	 *
+	 */
+	@Override
+	protected void removeAllAction() {
+		Object input = this.selectedElementsViewer.getInput();
+		if (input instanceof List<?>) {
+			for (Object curr : (List<?>) input) {
+				if (curr instanceof ITreeItemAxis) {
+					destroyCategoriesAxis((ITreeItemAxis) curr);
+				}
+			}
+			this.selectedElementsViewer.refresh();
+		}
+	}
+
+	/**
+	 * Destroy recursively all categories axis
+	 * 
+	 * @param axis
+	 *            an axis
+	 */
+	protected void destroyCategoriesAxis(ITreeItemAxis axis) {
+		for (ITreeItemAxis child : axis.getChildren()) {
+			destroyCategoriesAxis(child);
+		}
+		if (CategoriesWizardUtils.isCategoryItem(axis)) {
+			axis.setParent(null);
+			EcoreUtil.delete(axis);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#removeAction()
+	 *
+	 */
+	@Override
+	protected void removeAction() {
+		IStructuredSelection selection = (IStructuredSelection) this.selectedElementsViewer.getSelection();
+		for (Object current : selection.toList()) {
+			if (current instanceof ITreeItemAxis && ((ITreeItemAxis) current).getParent() != null) {
+				ITreeItemAxis axis = (ITreeItemAxis) current;
+				axis.setParent(null);
+				EcoreUtil.delete(axis);
+			}
+		}
+		this.selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the list of the selected element in the selection viewer
+	 */
+	protected List<ITreeItemAxis> getSelectionInSelectedElementsViewer() {
+		if (this.selectedElementsViewer != null) {
+			ISelection selection = this.selectedElementsViewer.getSelection();
+			if (selection instanceof IStructuredSelection) {
+				List<ITreeItemAxis> returnedValues = new ArrayList<ITreeItemAxis>();
+				for (Object current : ((IStructuredSelection) selection).toList()) {
+					if (current instanceof ITreeItemAxis) {
+						returnedValues.add((ITreeItemAxis) current);
+					}
+				}
+				return returnedValues;
+			}
+		}
+		return Collections.emptyList();
+	}
+
+	/**
+	 * 
+	 * @author Vincent Lorenzo
+	 *         This class is the factory used to create new ITreeItemAxis in the viewer of selected element
+	 *         It creates only {@link ITreeItemAxis} to represents depth to configure and its allows to edit only alias of categories
+	 */
+	public class CategoriesValueFactory implements ReferenceValueFactory {
+		/**
+		 * 
+		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#validateObjects(java.util.Collection)
+		 *
+		 * @param objectsToValidate
+		 * @return
+		 */
+		@Override
+		public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {
+			return null;
+		}
+
+		/**
+		 * 
+		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#edit(org.eclipse.swt.widgets.Control, java.lang.Object)
+		 *
+		 * @param widget
+		 * @param object
+		 * @return
+		 */
+		@Override
+		public Object edit(Control widget, Object object) {
+			String existingAlias = ((IAxis) object).getAlias();
+			InputDialog dialog = new InputDialog(widget.getShell(), Messages.ChooseCategoriesSelectionWidget_EditAlias, Messages.ChooseCategoriesSelectionWidget_EnterAliasToUseForTheCategory, existingAlias, null);
+
+			int result = dialog.open();
+			if (result == Window.OK) {
+				String newValue = dialog.getText();
+				((IAxis) object).setAlias(newValue);
+			}
+
+			return object;
+		}
+
+		@Override
+		public Object createObject(Control widget, Object context) {
+			Assert.isTrue(context instanceof ITreeItemAxis);
+			ITreeItemAxis rootItem = (ITreeItemAxis) context;
+			Assert.isTrue(rootItem.getParent() == null);
+
+			// find the maxDepth
+			int maxDepth = -1;
+			for (ITreeItemAxis axis : rootItem.getChildren()) {
+				Assert.isTrue(axis instanceof IdTreeItemAxis);
+				maxDepth = Math.max(maxDepth, Integer.parseInt((String) axis.getElement()));
+			}
+			int nextDepth = maxDepth + 1;
+			return IAxisFactory.createITreeItemAxis(rootItem, Integer.valueOf(nextDepth), null, null);
+		}
+
+		/**
+		 * 
+		 * @return
+		 */
+		@Override
+		public boolean canEdit() {
+			List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();
+			if (selectedAxis.size() == 1) {
+				return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));
+			}
+			return false;
+		}
+
+		/**
+		 * 
+		 * @return
+		 */
+		@Override
+		public boolean canCreateObject() {
+			return getContextForCreateAction() != null;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
index 075fa2c0788..a731acf047d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * 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.pages;

-

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ConfigurePasteForCategoriesSelectionWidget extends ChooseCategoriesSelectionWidget {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		super(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {

-		super(selector, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique) {

-		super(selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector) {

-		super(selector);

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ChooseCategoriesSelectionWidget#createListSectionContentProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	protected IContentProvider createListSectionContentProvider() {

-		return new ITreeItemContentProvider();

-	}

-}

+/*****************************************************************************
+ * 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.pages;
+
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ConfigurePasteForCategoriesSelectionWidget extends ChooseCategoriesSelectionWidget {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		super(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {
+		super(selector, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique) {
+		super(selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector) {
+		super(selector);
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ChooseCategoriesSelectionWidget#createListSectionContentProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	protected IContentProvider createListSectionContentProvider() {
+		return new ITreeItemContentProvider();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
index 28b3894f0e4..027b1842e78 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * 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.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ConfigurePasteForCategoriesWizardPage extends SelectCategoriesWizardPage {

-

-	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_NAME = "Configure Paste In Tree Table";

-

-	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_TITLE = "Configure the paste for each categories";

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public ConfigurePasteForCategoriesWizardPage(IElementSelector selector) {

-		this(DEFAULT_CONFIGURE_PASTE_PAGE_NAME, DEFAULT_CONFIGURE_PASTE_PAGE_TITLE, null, selector);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param pageName

-	 * @param pageTitle

-	 * @param defaultImage

-	 * @param selector

-	 */

-	public ConfigurePasteForCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {

-		super(pageName, pageTitle, defaultImage, selector);

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.SelectCategoriesWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 * @return

-	 */

-	@Override

-	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		return new ConfigurePasteForCategoriesSelectionWidget(selector, unique, ordered, upperBound);

-	}

-

-}

+/*****************************************************************************
+ * 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.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ConfigurePasteForCategoriesWizardPage extends SelectCategoriesWizardPage {
+
+	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_NAME = "Configure Paste In Tree Table";
+
+	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_TITLE = "Configure the paste for each categories";
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public ConfigurePasteForCategoriesWizardPage(IElementSelector selector) {
+		this(DEFAULT_CONFIGURE_PASTE_PAGE_NAME, DEFAULT_CONFIGURE_PASTE_PAGE_TITLE, null, selector);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param pageName
+	 * @param pageTitle
+	 * @param defaultImage
+	 * @param selector
+	 */
+	public ConfigurePasteForCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {
+		super(pageName, pageTitle, defaultImage, selector);
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.SelectCategoriesWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 * @return
+	 */
+	@Override
+	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		return new ConfigurePasteForCategoriesSelectionWidget(selector, unique, ordered, upperBound);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
index 4ead5810681..8f01f8ed152 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * 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.pages;

-

-import java.util.Collection;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-// TODO : move me?

-public class ITreeItemContentProvider implements ITreeContentProvider {

-	/**

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		// nothing to do

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public boolean hasChildren(Object arg0) {

-		if (arg0 instanceof ITreeItemAxis) {

-			return !((ITreeItemAxis) arg0).getChildren().isEmpty();

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public Object getParent(Object arg0) {

-		if (arg0 instanceof ITreeItemAxis) {

-			return ((ITreeItemAxis) arg0).getParent();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public Object[] getElements(Object arg0) {

-		if (arg0 instanceof Collection<?>) {

-			return ((Collection<?>) arg0).toArray();

-		}

-		return new Object[] { arg0 };

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public Object[] getChildren(Object arg0) {

-		if (arg0 instanceof ITreeItemAxis) {

-			return ((ITreeItemAxis) arg0).getChildren().toArray();

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @param arg0

-	 * @param arg1

-	 * @param arg2

-	 */

-	@Override

-	public void inputChanged(Viewer arg0, Object arg1, Object arg2) {

-		// nothing to do

-	}

-}

+/*****************************************************************************
+ * 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.pages;
+
+import java.util.Collection;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+// TODO : move me?
+public class ITreeItemContentProvider implements ITreeContentProvider {
+	/**
+	 * 
+	 */
+	@Override
+	public void dispose() {
+		// nothing to do
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public boolean hasChildren(Object arg0) {
+		if (arg0 instanceof ITreeItemAxis) {
+			return !((ITreeItemAxis) arg0).getChildren().isEmpty();
+		}
+		return false;
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public Object getParent(Object arg0) {
+		if (arg0 instanceof ITreeItemAxis) {
+			return ((ITreeItemAxis) arg0).getParent();
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public Object[] getElements(Object arg0) {
+		if (arg0 instanceof Collection<?>) {
+			return ((Collection<?>) arg0).toArray();
+		}
+		return new Object[] { arg0 };
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public Object[] getChildren(Object arg0) {
+		if (arg0 instanceof ITreeItemAxis) {
+			return ((ITreeItemAxis) arg0).getChildren().toArray();
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 *
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 */
+	@Override
+	public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
+		// nothing to do
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
index 94251f9198d..2b2bcba0c0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
@@ -1,218 +1,218 @@
-/*****************************************************************************

- * 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.wizard.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;

-import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * The page to configure the separator used in the CSV file

- *

- * @author Vincent Lorenzo

- *

- */

-public class ImportCSVConfigurationPage extends WizardPage {

-

-	/**

-	 * the paste separator

-	 */

-	private PasteSeparator separator;

-

-	/**

-	 * the text delimiter

-	 */

-	private TextDelimiter textDelimiter;

-

-	/**

-	 * the specific seaprator

-	 */

-	private char[] textChar = null;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the name of the import page

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image for this page

-	 * @param tableManager

-	 *            the table manager where the import will be done

-	 */

-	public ImportCSVConfigurationPage(final String pageName, final String title, final ImageDescriptor titleImage, final PasteSeparator defaultSeparator, final TextDelimiter defaultDelimiter) {

-		super(pageName, title, titleImage);

-		setDescription(Messages.ImportFilePage_SelectTheFileToImport);

-		this.separator = defaultSeparator;

-		this.textDelimiter = defaultDelimiter;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 */

-	@Override

-	public void createControl(final Composite parent1) {

-		final Composite pageComposite = new Composite(parent1, SWT.NONE);

-		setControl(pageComposite);

-		pageComposite.setLayout(new GridLayout(2, true));

-		final Group separatorGroup = new Group(pageComposite, SWT.NONE);

-		separatorGroup.setText(Messages.ImportCSVConfigurationPage_Separators);

-		separatorGroup.setLayout(new GridLayout(2, false));

-

-		for (final PasteSeparator current : PasteSeparator.values()) {

-			final Button button = new Button(separatorGroup, SWT.RADIO);

-			button.setText(current.getName());

-			button.addSelectionListener(new SelectionListener() {

-

-				@Override

-				public void widgetSelected(SelectionEvent e) {

-					if (button.isEnabled()) {

-						separator = current;

-					}

-					setPageComplete(validate());

-				}

-

-				@Override

-				public void widgetDefaultSelected(SelectionEvent e) {

-					// nothing to do

-				}

-			});

-			button.setSelection(current == separator);

-			final GridData data = new GridData();

-			if (current == PasteSeparator.OTHER) {

-				final Text text = new Text(separatorGroup, SWT.BORDER);

-				text.addKeyListener(new org.eclipse.swt.events.KeyListener() {

-

-					@Override

-					public void keyReleased(KeyEvent e) {

-						textChar = text.getTextChars();

-						setPageComplete(validate());

-					}

-

-					@Override

-					public void keyPressed(KeyEvent e) {

-						// nothing to do

-					}

-				});

-				button.addSelectionListener(new SelectionListener() {

-

-					@Override

-					public void widgetSelected(SelectionEvent e) {

-						text.setEnabled(button.getSelection());

-						setPageComplete(validate());

-					}

-

-					@Override

-					public void widgetDefaultSelected(SelectionEvent e) {

-					}

-				});

-				text.setEnabled(this.separator == PasteSeparator.OTHER);

-			} else {

-				data.horizontalSpan = 2;

-			}

-			button.setLayoutData(data);

-		}

-

-		final Composite textDelimiterComp = new Composite(pageComposite, SWT.NONE);

-		textDelimiterComp.setLayout(new GridLayout(2, false));

-		textDelimiterComp.setLayoutData(new GridData());

-		final Label label2 = new Label(textDelimiterComp, SWT.NONE);

-		label2.setText(Messages.ImportCSVConfigurationPage_SelectTheTextDelimiter);

-		final Combo combo = new Combo(textDelimiterComp, SWT.DROP_DOWN | SWT.READ_ONLY);

-

-		for (int i = 0; i < TextDelimiter.values().length; i++) {

-			final TextDelimiter current = TextDelimiter.values()[i];

-			combo.add(String.valueOf(current.getDelimiter()), i);

-			if (this.textDelimiter == current) {

-				combo.select(i);

-			}

-		}

-		combo.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				textDelimiter = TextDelimiter.values()[combo.getSelectionIndex()];

-				setPageComplete(validate());

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// nothing to do

-			}

-		});

-

-		setPageComplete(validate());

-	}

-

-	/**

-	 *

-	 * @return

-	 */

-	private boolean validate() {

-		if (this.separator == PasteSeparator.OTHER) {

-			if (this.textChar == null || this.textChar.length == 0) {

-				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorIsNotDefined);

-				return false;

-			} else if (this.textChar.length > 1) {

-				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorMustBeExcatlyOneChar);

-				return false;

-			}

-		}

-		setErrorMessage(null);

-		return true;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the selected separator

-	 */

-	public char getSeparator() {

-		if (this.separator == PasteSeparator.OTHER) {

-			return textChar[0];

-		}

-		return this.separator.getSeparator();

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the selected text delimiter

-	 */

-	public char getTextDelimiter() {

-		return this.textDelimiter.getDelimiter();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.wizard.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;
+import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * The page to configure the separator used in the CSV file
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ImportCSVConfigurationPage extends WizardPage {
+
+	/**
+	 * the paste separator
+	 */
+	private PasteSeparator separator;
+
+	/**
+	 * the text delimiter
+	 */
+	private TextDelimiter textDelimiter;
+
+	/**
+	 * the specific seaprator
+	 */
+	private char[] textChar = null;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the name of the import page
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image for this page
+	 * @param tableManager
+	 *            the table manager where the import will be done
+	 */
+	public ImportCSVConfigurationPage(final String pageName, final String title, final ImageDescriptor titleImage, final PasteSeparator defaultSeparator, final TextDelimiter defaultDelimiter) {
+		super(pageName, title, titleImage);
+		setDescription(Messages.ImportFilePage_SelectTheFileToImport);
+		this.separator = defaultSeparator;
+		this.textDelimiter = defaultDelimiter;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createControl(final Composite parent1) {
+		final Composite pageComposite = new Composite(parent1, SWT.NONE);
+		setControl(pageComposite);
+		pageComposite.setLayout(new GridLayout(2, true));
+		final Group separatorGroup = new Group(pageComposite, SWT.NONE);
+		separatorGroup.setText(Messages.ImportCSVConfigurationPage_Separators);
+		separatorGroup.setLayout(new GridLayout(2, false));
+
+		for (final PasteSeparator current : PasteSeparator.values()) {
+			final Button button = new Button(separatorGroup, SWT.RADIO);
+			button.setText(current.getName());
+			button.addSelectionListener(new SelectionListener() {
+
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (button.isEnabled()) {
+						separator = current;
+					}
+					setPageComplete(validate());
+				}
+
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// nothing to do
+				}
+			});
+			button.setSelection(current == separator);
+			final GridData data = new GridData();
+			if (current == PasteSeparator.OTHER) {
+				final Text text = new Text(separatorGroup, SWT.BORDER);
+				text.addKeyListener(new org.eclipse.swt.events.KeyListener() {
+
+					@Override
+					public void keyReleased(KeyEvent e) {
+						textChar = text.getTextChars();
+						setPageComplete(validate());
+					}
+
+					@Override
+					public void keyPressed(KeyEvent e) {
+						// nothing to do
+					}
+				});
+				button.addSelectionListener(new SelectionListener() {
+
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						text.setEnabled(button.getSelection());
+						setPageComplete(validate());
+					}
+
+					@Override
+					public void widgetDefaultSelected(SelectionEvent e) {
+					}
+				});
+				text.setEnabled(this.separator == PasteSeparator.OTHER);
+			} else {
+				data.horizontalSpan = 2;
+			}
+			button.setLayoutData(data);
+		}
+
+		final Composite textDelimiterComp = new Composite(pageComposite, SWT.NONE);
+		textDelimiterComp.setLayout(new GridLayout(2, false));
+		textDelimiterComp.setLayoutData(new GridData());
+		final Label label2 = new Label(textDelimiterComp, SWT.NONE);
+		label2.setText(Messages.ImportCSVConfigurationPage_SelectTheTextDelimiter);
+		final Combo combo = new Combo(textDelimiterComp, SWT.DROP_DOWN | SWT.READ_ONLY);
+
+		for (int i = 0; i < TextDelimiter.values().length; i++) {
+			final TextDelimiter current = TextDelimiter.values()[i];
+			combo.add(String.valueOf(current.getDelimiter()), i);
+			if (this.textDelimiter == current) {
+				combo.select(i);
+			}
+		}
+		combo.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				textDelimiter = TextDelimiter.values()[combo.getSelectionIndex()];
+				setPageComplete(validate());
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// nothing to do
+			}
+		});
+
+		setPageComplete(validate());
+	}
+
+	/**
+	 *
+	 * @return
+	 */
+	private boolean validate() {
+		if (this.separator == PasteSeparator.OTHER) {
+			if (this.textChar == null || this.textChar.length == 0) {
+				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorIsNotDefined);
+				return false;
+			} else if (this.textChar.length > 1) {
+				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorMustBeExcatlyOneChar);
+				return false;
+			}
+		}
+		setErrorMessage(null);
+		return true;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the selected separator
+	 */
+	public char getSeparator() {
+		if (this.separator == PasteSeparator.OTHER) {
+			return textChar[0];
+		}
+		return this.separator.getSeparator();
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the selected text delimiter
+	 */
+	public char getTextDelimiter() {
+		return this.textDelimiter.getDelimiter();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
index d28cc75a5e8..5ac205af9f6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * 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.wizard.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ImportInvertedTableErrorPage extends WizardPage {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the page name

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image of the page

-	 */

-	public ImportInvertedTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {

-		super(pageName, title, titleImage);

-	}

-

-	/**

-	 * Create contents of the wizard.

-	 *

-	 * @param parent

-	 */

-	@Override

-	public void createControl(final Composite parent) {

-		Label label = new Label(parent, SWT.NONE);

-		label.setText("Inverted Table are not yet managed"); //$NON-NLS-1$

-		setControl(label);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPageComplete() {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * 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.wizard.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ImportInvertedTableErrorPage extends WizardPage {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the page name
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image of the page
+	 */
+	public ImportInvertedTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {
+		super(pageName, title, titleImage);
+	}
+
+	/**
+	 * Create contents of the wizard.
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createControl(final Composite parent) {
+		Label label = new Label(parent, SWT.NONE);
+		label.setText("Inverted Table are not yet managed"); //$NON-NLS-1$
+		setControl(label);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPageComplete() {
+		return false;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
index b4e8ba34e44..3509acb03fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * 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.wizard.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ImportTableErrorPage extends WizardPage {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the page name

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image of the page

-	 */

-	public ImportTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {

-		super(pageName, title, titleImage);

-	}

-

-	/**

-	 * Create contents of the wizard.

-	 *

-	 * @param parent

-	 */

-	@Override

-	public void createControl(final Composite parent) {

-		Label label = new Label(parent, SWT.NONE);

-		label.setText(Messages.ImportTableErrorPage_PleaseOpenAPapyrusEditor);

-		setControl(label);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPageComplete() {

-		return super.isPageComplete();

-	}

-

-}

+/*****************************************************************************
+ * 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.wizard.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ImportTableErrorPage extends WizardPage {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the page name
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image of the page
+	 */
+	public ImportTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {
+		super(pageName, title, titleImage);
+	}
+
+	/**
+	 * Create contents of the wizard.
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createControl(final Composite parent) {
+		Label label = new Label(parent, SWT.NONE);
+		label.setText(Messages.ImportTableErrorPage_PleaseOpenAPapyrusEditor);
+		setControl(label);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPageComplete() {
+		return super.isPageComplete();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
index f3adf3a732a..e7c8fc5563c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
@@ -1,195 +1,195 @@
-/*****************************************************************************

- * 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.pages;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.DoubleClickEvent;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.util.ValueUtils;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;

-import org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWizardPage {

-

-	public static final String DEFAULT_SELECT_CATEGORIES_PAGE_NAME = Messages.SelectCategoriesWizardPage_SelectCategoriesPage;

-

-	public static final String DEFAULT_SELECT_CATEGORIES_TITLE = Messages.SelectCategoriesWizardPage_SelectCategoriesToListenInTheTreeTable;

-

-	private IElementSelector selector;

-

-	private IElementSelectionListener selectorListener;

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param selector

-	 */

-	public SelectCategoriesWizardPage(IElementSelector selector) {

-		this(DEFAULT_SELECT_CATEGORIES_PAGE_NAME, DEFAULT_SELECT_CATEGORIES_TITLE, null, selector);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the name of the page

-	 * @param pageTitle

-	 *            the title of the page

-	 * @param defaultImage

-	 *            the image to use for the page

-	 * @param selector

-	 *            the selector to use

-	 */

-	public SelectCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {

-		super(pageName, pageTitle, defaultImage, selector, false, true, ValueUtils.MANY);

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 * @return

-	 */

-	@Override

-	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		this.selector = selector;

-		this.selectorListener = new SelectorListener();

-		// the only way found to refresh properly next button

-		this.selector.addElementSelectionListener(this.selectorListener);

-

-		return new ChooseCategoriesSelectionWidget(selector, unique, ordered, upperBound) {

-

-

-

-

-			/**

-			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-			 *

-			 * @param e

-			 */

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				super.widgetSelected(e);

-				validate();

-			}

-

-			/**

-			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)

-			 *

-			 * @param event

-			 */

-			@Override

-			public void doubleClick(DoubleClickEvent event) {

-				super.doubleClick(event);

-				validate();

-			}

-		};

-	}

-

-	/**

-	 * 

-	 * @author Vincent Lorenzo

-	 * 

-	 *         this class allows to refresh properly the next button after a double click on the left part of the widget

-	 *

-	 */

-	private class SelectorListener implements IElementSelectionListener {

-

-		/**

-		 * 

-		 * @see org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener#addElements(java.lang.Object[])

-		 *

-		 * @param elements

-		 */

-		@Override

-		public void addElements(Object[] elements) {

-			Display.getDefault().asyncExec(new Runnable() {

-

-				/**

-				 * 

-				 * @see java.lang.Runnable#run()

-				 *

-				 */

-				@Override

-				public void run() {

-					validate();

-

-				}

-			});

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		if (this.selector != null) {

-			this.selector.removeElementSelectionListener(selectorListener);

-			this.selector = null;

-		}

-		super.dispose();

-	}

-

-	/**

-	 * validate the page and display error message if required

-	 */

-	protected void validate() {

-		List<Object> selection = getWidget().getSelection();

-		List<Integer> incompleteDepth = new ArrayList<Integer>();

-		for (Object current : selection) {

-			Assert.isTrue(current instanceof ITreeItemAxis);

-			ITreeItemAxis rootItem = (ITreeItemAxis) current;

-			Assert.isTrue(CategoriesWizardUtils.isRootItem(rootItem));

-			for (ITreeItemAxis depthItem : rootItem.getChildren()) {

-				Assert.isTrue(CategoriesWizardUtils.isDepthItem(depthItem));

-				if (depthItem.getChildren().isEmpty()) {

-					int depth = Integer.valueOf(depthItem.getElement().toString()).intValue();

-					if (depth != 0) {

-						incompleteDepth.add(Integer.valueOf(depth));

-					}

-				}

-			}

-		}

-		if (incompleteDepth.isEmpty()) {

-			setErrorMessage(null);

-		} else {

-			StringBuilder builder = new StringBuilder(NLS.bind("The following depths don't have categories {0}", incompleteDepth.toString()));

-			setErrorMessage(builder.toString());

-		}

-

-		setPageComplete(getErrorMessage() == null);

-	}

-}

+/*****************************************************************************
+ * 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.pages;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.util.ValueUtils;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;
+import org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWizardPage {
+
+	public static final String DEFAULT_SELECT_CATEGORIES_PAGE_NAME = Messages.SelectCategoriesWizardPage_SelectCategoriesPage;
+
+	public static final String DEFAULT_SELECT_CATEGORIES_TITLE = Messages.SelectCategoriesWizardPage_SelectCategoriesToListenInTheTreeTable;
+
+	private IElementSelector selector;
+
+	private IElementSelectionListener selectorListener;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param selector
+	 */
+	public SelectCategoriesWizardPage(IElementSelector selector) {
+		this(DEFAULT_SELECT_CATEGORIES_PAGE_NAME, DEFAULT_SELECT_CATEGORIES_TITLE, null, selector);
+	}
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the name of the page
+	 * @param pageTitle
+	 *            the title of the page
+	 * @param defaultImage
+	 *            the image to use for the page
+	 * @param selector
+	 *            the selector to use
+	 */
+	public SelectCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {
+		super(pageName, pageTitle, defaultImage, selector, false, true, ValueUtils.MANY);
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 * @return
+	 */
+	@Override
+	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		this.selector = selector;
+		this.selectorListener = new SelectorListener();
+		// the only way found to refresh properly next button
+		this.selector.addElementSelectionListener(this.selectorListener);
+
+		return new ChooseCategoriesSelectionWidget(selector, unique, ordered, upperBound) {
+
+
+
+
+			/**
+			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 *
+			 * @param e
+			 */
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				super.widgetSelected(e);
+				validate();
+			}
+
+			/**
+			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
+			 *
+			 * @param event
+			 */
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				super.doubleClick(event);
+				validate();
+			}
+		};
+	}
+
+	/**
+	 * 
+	 * @author Vincent Lorenzo
+	 * 
+	 *         this class allows to refresh properly the next button after a double click on the left part of the widget
+	 *
+	 */
+	private class SelectorListener implements IElementSelectionListener {
+
+		/**
+		 * 
+		 * @see org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener#addElements(java.lang.Object[])
+		 *
+		 * @param elements
+		 */
+		@Override
+		public void addElements(Object[] elements) {
+			Display.getDefault().asyncExec(new Runnable() {
+
+				/**
+				 * 
+				 * @see java.lang.Runnable#run()
+				 *
+				 */
+				@Override
+				public void run() {
+					validate();
+
+				}
+			});
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		if (this.selector != null) {
+			this.selector.removeElementSelectionListener(selectorListener);
+			this.selector = null;
+		}
+		super.dispose();
+	}
+
+	/**
+	 * validate the page and display error message if required
+	 */
+	protected void validate() {
+		List<Object> selection = getWidget().getSelection();
+		List<Integer> incompleteDepth = new ArrayList<Integer>();
+		for (Object current : selection) {
+			Assert.isTrue(current instanceof ITreeItemAxis);
+			ITreeItemAxis rootItem = (ITreeItemAxis) current;
+			Assert.isTrue(CategoriesWizardUtils.isRootItem(rootItem));
+			for (ITreeItemAxis depthItem : rootItem.getChildren()) {
+				Assert.isTrue(CategoriesWizardUtils.isDepthItem(depthItem));
+				if (depthItem.getChildren().isEmpty()) {
+					int depth = Integer.valueOf(depthItem.getElement().toString()).intValue();
+					if (depth != 0) {
+						incompleteDepth.add(Integer.valueOf(depth));
+					}
+				}
+			}
+		}
+		if (incompleteDepth.isEmpty()) {
+			setErrorMessage(null);
+		} else {
+			StringBuilder builder = new StringBuilder(NLS.bind("The following depths don't have categories {0}", incompleteDepth.toString()));
+			setErrorMessage(builder.toString());
+		}
+
+		setPageComplete(getErrorMessage() == null);
+	}
+}