1053 files changed, 0 insertions, 97167 deletions

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.classpath
deleted file mode 100644
index deb8f7cc234..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

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

-	<classpathentry excluding="org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEBooleanCheckBoxCellEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEEnumEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEIntCellEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEStringCellEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/registry/EMFFeatureCellEditorFactory.java" kind="src" path="src"/>

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

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.project
deleted file mode 100644
index 2c06e6705e9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

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

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

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

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

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

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

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

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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
deleted file mode 100644
index 25bc8d92b4e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EMF Nattable (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.nattable;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.emf.nattable.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.labelprovider,
- org.eclipse.papyrus.infra.core,
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.emf.edit,
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.gmf.runtime.emf.type.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.infra.emf.nattable,
- org.eclipse.papyrus.infra.emf.nattable.celleditor.config,
- org.eclipse.papyrus.infra.emf.nattable.manager.axis,
- org.eclipse.papyrus.infra.emf.nattable.manager.cell,
- org.eclipse.papyrus.infra.emf.nattable.provider,
- org.eclipse.papyrus.infra.emf.nattable.registry,
- org.eclipse.papyrus.infra.emf.nattable.validator
-Import-Package: org.eclipse.papyrus.commands.wrappers
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/build.properties
deleted file mode 100644
index feffce05748..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               icons/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg.gif
deleted file mode 100644
index 2c62284e92b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg_unidir.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg_unidir.gif
deleted file mode 100644
index 30bf63ea561..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg_unidir.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/attributes.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/attributes.gif
deleted file mode 100644
index d4cb4254d92..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/attributes.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/inv_aggreg.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/inv_aggreg.gif
deleted file mode 100644
index 6f1021d4d1c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/inv_aggreg.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/link.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/link.gif
deleted file mode 100644
index 94c14024075..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/link.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/link_unidir.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/link_unidir.gif
deleted file mode 100644
index c8169bcfbf8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/link_unidir.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/opposite_links.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/opposite_links.gif
deleted file mode 100644
index 63520975df7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/icons/opposite_links.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc
deleted file mode 100644
index 58d0d3e5769..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the EMF celleditors for the papyrus nattable widget">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
deleted file mode 100644
index 5801e449bed..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

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

-      <configuration

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

-            order="1000">

-      </configuration>

-   </extension>

- <extension

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

-      <labelProvider

-            priority="1400"

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

-         <labelProviderContext

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

-         </labelProviderContext>

-         <labelProviderContext

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

-         </labelProviderContext>

-      </labelProvider>

-      <labelProvider

-            priority="1500"

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

-         <labelProviderContext

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

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-	<extension

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

-    <axisManager

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

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

-    </axisManager>

-    <axisManager

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

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

-    </axisManager>

- </extension>

- <extension

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

-    <cellManager

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

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

-          order="1000">

-    </cellManager>

- </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
deleted file mode 100644
index 82a08b67971..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
deleted file mode 100644
index 92742a7261a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*****************************************************************************

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

-import java.util.List;

-

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

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

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

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

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

-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.utils.EMFHelper;

-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

- * 

- */

-public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfiguration {

-

-	/**

-	 * the id of the editor config

-	 */

-	public static final String EDITOR_CONFIG_ID = "EMF_EDITOR";

-

-	/**

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

-	 */

-	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 MultiLineTextCellEditor(true);

-			break;

-		case SINGLE_INTEGER:

-			editor = new TextCellEditor();

-			break;

-		case SINGLE_BOOLEAN:

-			editor = new CheckBoxCellEditor();

-			break;

-		case SINGLE_EENUM_TYPE:

-			editor = new ComboBoxCellEditor(new IComboBoxDataProvider() {//FIXME add a method to get the dataprovider!

-

-

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

-					Object el = elementProvider.getColumnElement(columnIndex);

-					//					Object el = elementProvider.getColumnElement(columnIndex);

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

-					for(final EEnumLiteral instances : ((EEnum)((EStructuralFeature)axisElement).getEType()).getELiterals()) {

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

-					}

-					return literals;

-				}

-			});

-			break;

-		default:

-		}

-		return editor;

-	}

-

-

-

-	/**

-	 * 

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

-	 * 

-	 * @return

-	 */

-	public String getEditorId() {

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

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.configs.conf#getDisplayConvert(Object, Table, org.eclipse.jface.viewers.ILabelProvider)

-	 * 

-	 * @return

-	 */

-

-	public IDisplayConverter getDisplayConvert(Object axisElement, Table table, 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:

-		}

-		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

-	 */

-	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();//FIXME : 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

-	 */

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

-		}

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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java
deleted file mode 100644
index 7369266c984..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*****************************************************************************

- * 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.manager.axis;

-

-import java.util.Collection;

-

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

-import org.eclipse.emf.common.command.CompoundCommand;

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

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

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

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

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

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

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

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

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

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

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

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * 

- * This manager is a master manager, that's to say, it doesn't listen the contents of the others managers.

- * This manager modify the model for each changes on axis (so each axis is stored)

- * 

- */

-public class EObjectAxisManager extends AbstractAxisManager {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param objectToAdd

-	 *        the object to add to this axis

-	 * @return

-	 *         the command to create the required axis in the model

-	 */

-	@Override

-	public Command getAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.EObjectManager_AddAxisElement);

-		for(final Object object : objectToAdd) {

-			if(isAllowedContents(object)) {

-				final EObjectAxis horizontalAxis = NattableaxisFactory.eINSTANCE.createEObjectAxis();

-				horizontalAxis.setElement((EObject)object);

-				horizontalAxis.setManager(this.representedAxisManager);

-				final Command tmp = AddCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), horizontalAxis);

-				cmd.append(tmp);

-			}

-		}

-		return cmd;

-	}

-

-	/**

-	 * This manager doesn't add axis on the other side, because it is a master axis manager

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getComplementaryAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

-		return null;

-	}

-

-

-	/**

-	 * 

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

-	 * 

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		boolean isAllowed = super.isAllowedContents(object);

-		if(isAllowed) {

-			return object instanceof EObject;

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		for(Object object : objectsToAdd) {

-			if(isAllowedContents(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ISubAxisManager#isDynamic()

-	 * 

-	 * @return

-	 */

-	public boolean isDynamic() {

-		return false;

-	}

-

-	/**

-	 * 

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

-	 * 

-	 * @return

-	 */

-	public boolean isSlave() {

-		return false;

-	}

-

-	/**

-	 * 

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

-	 * 

-	 * @return

-	 */

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-

-	@Override

-	public String getElementAxisName(IAxis axis) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

-	 * 

-	 * @param axis

-	 * @return

-	 */

-	public boolean canDestroyAxisElement(final IAxis axis) {

-		final EObject object = (EObject)axis.getElement();

-		return !EMFHelper.isReadOnly(object);

-	}

-

-	/**

-	 * 

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

-	 * 

-	 * @param axisPosition

-	 * @return

-	 */

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		final Object current = getElements().get(axisPosition);

-		if(current instanceof EObjectAxis) {

-			return !EMFHelper.isReadOnly(((EObjectAxis)current).getElement());

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Integer)

-	 * 

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		final Object current = getElements().get(axisPosition);

-		if(current instanceof EObjectAxis) {

-			final EObject element = ((EObjectAxis)current).getElement();

-			final DestroyElementRequest request = new DestroyElementRequest((TransactionalEditingDomain)getContextEditingDomain(), element, false);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(element);

-			return new GMFtoEMFCommandWrapper(provider.getEditCommand(request));

-		}

-		return null;

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java
deleted file mode 100644
index 284edfa0adf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*****************************************************************************

- * 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.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Set;

-

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

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

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;

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

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

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

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

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * the axis manager for EStructuralFeature

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class EStructuralFeatureAxisManager extends AbstractAxisManager {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getComplementaryAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

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

-		for(final Object current : objectToAdd) {

-			if(current instanceof EObject) {

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

-			}

-		}

-		features.removeAll(getTableManager().getElementsList(getRepresentedContentProvider()));

-		if(!features.isEmpty()) {

-			return getAddAxisCommand(domain, features);

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getAddAxisCommand(EditingDomain domain, Collection<Object> objectToAdd) {

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

-		for(final Object current : objectToAdd) {

-			if(isAllowedContents(current)) {

-				final EStructuralFeatureAxis newAxis = NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis();

-				newAxis.setElement((EStructuralFeature)current);

-				newAxis.setManager(this.representedAxisManager);

-				toAdd.add(newAxis);

-			}

-		}

-		if(!toAdd.isEmpty()) {

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

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToDestroy

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisCommand(EditingDomain domain, Collection<Object> objectToDestroy) {

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());

-		final CompositeCommand compositeCommand = new CompositeCommand("Destroy IAxis Command");

-		for(final IAxis current : getRepresentedContentProvider().getAxis()) {

-			if(current.getManager() == this.representedAxisManager) {

-				if(objectToDestroy.contains(current) || objectToDestroy.contains(current.getElement())) {

-					final DestroyElementRequest request = new DestroyElementRequest((TransactionalEditingDomain)domain, current, false);

-					compositeCommand.add(provider.getEditCommand(request));

-				}

-			}

-		}

-		if(!compositeCommand.isEmpty()) {

-			return new GMFtoEMFCommandWrapper(compositeCommand);

-		}

-		return null;

-

-	}

-

-	/**

-	 * 

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

-	 * 

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		boolean isAllowed = super.isAllowedContents(object);

-		if(isAllowed) {

-			return object instanceof EStructuralFeature;

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canInsertAxis(java.util.Collection, int)

-	 * 

-	 * @param objectsToAdd

-	 * @param index

-	 * @return

-	 */

-	@Override

-	public boolean canInsertAxis(Collection<Object> objectsToAdd, int index) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		for(Object object : objectsToAdd) {

-			if(isAllowedContents(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * calculus of the contents of the axis

-	 */

-

-	public Collection<Object> getAllPossibleAxis() {

-		Set<Object> objects = new HashSet<Object>();

-		for(final Object current : getAllManagedAxis()) {

-			EClass eClass = (EClass)current;

-			EPackage ePackage = eClass.getEPackage();

-			if(!eClass.getEStructuralFeatures().isEmpty()) {

-				objects.add(ePackage);

-			}

-		}

-		return objects;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ISubAxisManager#isDynamic()

-	 * 

-	 * @return

-	 */

-	public boolean isDynamic() {

-		return false;

-	}

-

-	/**

-	 * 

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

-	 * 

-	 * @return

-	 */

-	public boolean isSlave() {

-		return true;

-	}

-

-	/**

-	 * 

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

-	 * 

-	 * @return

-	 */

-	public boolean canEditAxisHeader() {

-		return true;

-	}

-

-	/**

-	 * 

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

-	 * 

-	 * @param axis

-	 * @return

-	 */

-	@Override

-	public String getElementAxisName(IAxis axis) {

-		if(axis instanceof EStructuralFeatureAxis) {

-			return ((EStructuralFeatureAxis)axis).getElement().getName();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

-	 * 

-	 * @param axis

-	 * @return

-	 */

-	public boolean canDestroyAxisElement(final IAxis axis) {

-		final EObject object = (EObject)axis.getElement();

-		return !EMFHelper.isReadOnly(object);

-	}

-

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		return false;

-	}

-

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
deleted file mode 100644
index 91fcbddae13..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*****************************************************************************

- * 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.manager.cell;

-

-import java.util.ArrayList;

-import java.util.List;

-

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

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

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

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

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

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

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;

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

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

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * Cell Manager which allows to get the value of an {@link EStructuralFeature} for an {@link EObject}

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class EMFFeatureValueCellManager extends AbstractCellManager {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handles(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	public boolean handles(final Object obj1, final Object obj2) {

-		return organizeObject(obj1, obj2).size() == 2;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getValue(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	public Object getValue(final Object obj1, final Object obj2) {

-		final List<EObject> objects = organizeObject(obj1, obj2);

-		final EObject eobject = objects.get(0);

-		final EStructuralFeature feature = (EStructuralFeature)objects.get(1);

-		if(eobject.eClass().getEAllStructuralFeatures().contains(feature)) {

-			return eobject.eGet(feature);

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	protected List<EObject> organizeObject(Object obj1, Object obj2) {

-		if(obj1 instanceof IAxis) {

-			obj1 = ((IAxis)obj1).getElement();

-		}

-		if(obj2 instanceof IAxis) {

-			obj2 = ((IAxis)obj2).getElement();

-		}

-		final List<EObject> objects = new ArrayList<EObject>();

-		if(obj1 instanceof EObject && obj2 instanceof EStructuralFeature) {

-			objects.add((EObject)obj1);

-			objects.add((EObject)obj2);

-		} else if(obj1 instanceof EStructuralFeature && obj2 instanceof EObject) {

-			objects.add((EObject)obj2);

-			objects.add((EObject)obj1);

-		}

-		return objects;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	public boolean isCellEditable(Object obj1, Object obj2) {

-		final List<EObject> objects = organizeObject(obj1, obj2);

-		if(objects.size() == 2) {

-			final EObject object = objects.get(0);

-			final EStructuralFeature feature = (EStructuralFeature)objects.get(1);

-			//FIXME : we must manage the derived, the read-only, the changeable, ...

-			if(object.eClass().getEAllStructuralFeatures().contains(feature)) {

-				//				if(!feature.isChangeable()){

-				//					return false;

-				//				}

-				if(!feature.isDerived()) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getSetValueCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Object, java.lang.Object, java.lang.Object)

-	 * 

-	 * @param domain

-	 * @param rowElement

-	 * @param lineElement

-	 * @param newValue

-	 * @return

-	 */

-	public Command getSetValueCommand(EditingDomain domain, Object rowElement, Object lineElement, Object newValue) {

-		final List<EObject> objects = organizeObject(rowElement, lineElement);

-		final AbstractEditCommandRequest request = new SetRequest((TransactionalEditingDomain)domain, objects.get(0), (EStructuralFeature)objects.get(1), newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(objects.get(0));

-		return new GMFtoEMFCommandWrapper(provider.getEditCommand(request));

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handlesAxisElement(java.lang.Object)

-	 * 

-	 * @param obj

-	 * @return

-	 */

-	public boolean handlesAxisElement(Object obj) {

-		return obj instanceof EStructuralFeature || obj instanceof EStructuralFeatureAxis;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
deleted file mode 100644
index 6a5f3127c7e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
deleted file mode 100644
index ae225fa44d5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
deleted file mode 100644
index 9330a162e4d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.emf.nattable.provider;

-

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

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

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

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

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

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

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

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

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

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

-

-/**

- * The label provider used for header when they represents an {@link EObject} and NOT an {@link EStructuralFeature}

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class EMFEObjectHeaderLabelProvider 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 ILabelProviderContextElement) {

-			Object object = ((ILabelProviderContextElement)element).getObject();

-			if(object instanceof IAxis) {

-				object = ((IAxis)object).getElement();

-			}

-			return object instanceof EObject && !(object instanceof EStructuralFeature);

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		ILabelProviderContextElement context = (ILabelProviderContextElement)element;

-		EObject object = (EObject)((ILabelProviderContextElement)element).getObject();

-		if(object instanceof EObjectAxis) {

-			object = ((EObjectAxis)object).getElement();

-		}

-		final IConfigRegistry configRegistry = context.getConfigRegistry();

-		final LabelProviderService serv = getLabelProviderService(configRegistry);

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

-		}

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

-			return "";

-		}

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

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object element) {

-		EObject object = (EObject)((ILabelProviderContextElement)element).getObject();

-		if(object instanceof EObjectAxis) {

-			object = ((EObjectAxis)object).getElement();

-		}

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		final LabelProviderService serv = getLabelProviderService(configRegistry);

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

-		}

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

-			return null;

-		}

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

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
deleted file mode 100644
index 647a7ca8520..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*****************************************************************************

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

-

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

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

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

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

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

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

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

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

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

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

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

-

-/**

- * Provides the label for the EstructuralFeature

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class EMFFeatureHeaderLabelProvider extends EMFEObjectHeaderLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 *         <code>true</code> if we are looking for the label of an EStructuralFeature

-	 */

-	@Override

-	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

-			final Object object = ((ILabelProviderContextElement)element).getObject();

-			return object instanceof EStructuralFeature || object instanceof EStructuralFeatureAxis;

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @param featureConf

-	 *        the configuration to use to know what display in the label

-	 * @param configRegistry

-	 *        the configRegistry

-	 * @param name

-	 *        the name of the feature

-	 * @param type

-	 *        the type of the feature

-	 * @param isDerived

-	 *        <code>true</code> if the feature is derived

-	 * @param lowerBound

-	 *        the lower bound of the feature

-	 * @param upperBounds

-	 *        the upper bound of the feature

-	 * @return

-	 *         the text to display for the feature according to these informations and the preferences of the user

-	 */

-	protected String getText(FeatureLabelProviderConfiguration featureConf, final IConfigRegistry configRegistry, final String name, final Object type, final boolean isDerived, final int lowerBound, final int upperBounds) {

-		//we collect the required values

-		boolean displayName = featureConf.isDisplayName();

-		boolean displayMultiplicity = featureConf.isDisplayMultiplicity();

-		boolean displayType = featureConf.isDisplayType();

-		boolean displayIsDerived = featureConf.isDisplayIsDerived();

-

-		String displayedText = ""; //$NON-NLS-1$

-		if(isDerived && displayIsDerived) {

-			displayedText += "/"; //$NON-NLS-1$

-		}

-		if(displayName) {

-			displayedText += name;

-		}

-		if(displayType) {

-			if(displayName) {

-				displayedText += " : "; //$NON-NLS-1$

-			}

-			displayedText += getTypeName(configRegistry, type);

-		}

-		if(displayMultiplicity) {

-			displayedText += " ["; //$NON-NLS-1$

-			if(upperBounds == -1 && lowerBound <= 1) {

-				displayedText += "*"; //$NON-NLS-1$

-			} else if(lowerBound == upperBounds) {

-				displayedText += Integer.toString(lowerBound);

-			} else {

-				displayedText += Integer.toString(lowerBound);

-				displayedText += ".."; //$NON-NLS-1$

-				if(upperBounds == -1) {

-					displayedText += "*"; //$NON-NLS-1$

-				} else {

-					displayedText += Integer.toString(upperBounds);

-				}

-			}

-			displayedText += "]"; //$NON-NLS-1$

-		}

-

-		return displayedText;

-	}

-

-	/**

-	 * 

-	 * @param configRegistry

-	 *        the configRegistry

-	 * @param type

-	 *        the type of the feature

-	 * @return

-	 *         the name to display for the type

-	 */

-	protected String getTypeName(final IConfigRegistry configRegistry, final Object type) {

-		final LabelProviderService serv = getLabelProviderService(configRegistry);

-		if(type instanceof EClassifier) {

-			return ((EClassifier)type).getName();

-		} else {

-			return serv.getLabelProvider(type).getText(type);

-		}

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		final Object object = ((ILabelProviderContextElement)element).getObject();

-		EStructuralFeature feature = null;

-		String alias = "";

-		if(object instanceof EStructuralFeatureAxis) {

-			feature = ((EStructuralFeatureAxis)object).getElement();

-			alias = ((EStructuralFeatureAxis)object).getAlias();

-		} else if(feature instanceof EStructuralFeature) {

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

-		}

-

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

-		}

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

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

-		}

-		if(conf instanceof FeatureLabelProviderConfiguration) {

-			String nameToDisplay = feature.getName();

-			if(alias != null && !alias.equals("")) {

-				nameToDisplay = alias;

-			}

-			return getText((FeatureLabelProviderConfiguration)conf, configRegistry, nameToDisplay, feature.getEType(), feature.isDerived(), feature.getLowerBound(), feature.getUpperBound());

-		} else {

-			return super.getText(element);

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object element) {

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

-		}

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

-			return null;

-		}

-

-		final Object object = ((ILabelProviderContextElement)element).getObject();

-		EStructuralFeature feature = null;

-		if(object instanceof EStructuralFeatureAxis) {

-			feature = ((EStructuralFeatureAxis)object).getElement();

-		} else if(object instanceof EStructuralFeature) {

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

-		}

-		if(feature instanceof EAttribute) {

-			return EStructuralFeatureImageRegistry.getAttributeIcon();

-

-		} else if(feature instanceof EReference) {

-			return getEReferenceImage((EReference)feature);

-		}

-		return super.getImage(feature);

-	}

-

-

-	/**

-	 * 

-	 * @param reference

-	 *        an EReference

-	 * @return

-	 *         the image for this reference

-	 */

-	public static Image getEReferenceImage(final EReference reference) {

-		final EReference opposite = reference.getEOpposite();

-

-		if(reference.isContainment()) {

-			if(opposite == null) {

-				return EStructuralFeatureImageRegistry.getUnidirectionalAggregIcon();

-			}

-			return EStructuralFeatureImageRegistry.getAggregIcon();

-		}

-

-		if(opposite != null && opposite.isContainment()) {

-			return EStructuralFeatureImageRegistry.getInvAggregIcon();

-		}

-

-		if(opposite == null) {

-			return EStructuralFeatureImageRegistry.getUnidirectionalLinkIcon();

-		}

-		return EStructuralFeatureImageRegistry.getLinkIcon();

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
deleted file mode 100644
index e139d41d7d7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
deleted file mode 100644
index 2ce0cb3d417..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

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

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

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

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.project
deleted file mode 100644
index 7659c2a17b7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

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

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

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

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

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

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

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

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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
deleted file mode 100644
index af4dd2798f5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.emf.edit,
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.emf.transaction,
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",
- org.eclipse.e4.ui.workbench,
- org.eclipse.e4.core.contexts,
- org.eclipse.core.expressions
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.infra.nattable.common,
- org.eclipse.papyrus.infra.nattable.common.editor,
- org.eclipse.papyrus.infra.nattable.common.factory,
- org.eclipse.papyrus.infra.nattable.common.handlers,
- org.eclipse.papyrus.infra.nattable.common.modelresource,
- org.eclipse.papyrus.infra.nattable.common.utils
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index aeb077e1543..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.common

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Papyrus Nattable Editor Common (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/build.properties
deleted file mode 100644
index b9407811706..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/icons/table.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/icons/table.gif
deleted file mode 100644
index 4c9048708b0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/icons/table.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/icons/table.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/icons/table.png
deleted file mode 100644
index 2a979527f4a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/icons/table.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/plugin.xml
deleted file mode 100644
index 573663ace13..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/plugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-<!--We declare the model used for the Papyrus Table Editor  -->

-   <extension point="org.eclipse.papyrus.infra.core.model">

-      <model classname="org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel" description="Model for Papyrus Nattable editors">

-      </model>

-   </extension>

- <extension id="papyrus.table.menuspapyrus.table.menu" name="Papyrus Table Menus" point="org.eclipse.ui.menus">

-      <menuContribution allPopups="false" locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">

-         <menu icon="icons/table.gif" id="org.eclipse.papyrus.infra.nattable.popupmenu.createnattable" label="New Papyrus Nattable" mnemonic="&amp;T" tooltip="The Papyrus nattable menu">

-         </menu>

-      </menuContribution>

-      <menuContribution allPopups="false" locationURI="menu:org.eclipse.papyrus.ui.menu?after=org.eclipse.papyrus.uml.diagram.ui.menu.diagrams">

-         <menu

-               icon="icons/table.gif"

-               id="org.eclipse.papyrus.infra.nattable.menu.createnattable"

-               label="New Papyrus Nattable"

-               mnemonic="&amp;T"

-               tooltip="The Papyrus nattable menu">

-         </menu>

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?endof=org.eclipse.papyrus.uml.diagram.ui.toolbar">

-         <toolbar id="org.eclipse.papyrus.infra.nattable.toolbar.createnattable" label="New Papyrus Nattable Toolbar">

-         </toolbar>

-      </menuContribution>

-   </extension>

- <extension

-       point="org.eclipse.papyrus.infra.core.papyrusDiagram">

-    <editorDiagram

-          factoryClass="org.eclipse.papyrus.infra.nattable.common.factory.NattableEditorFactory"

-          icon="icons/table.gif">

-    </editorDiagram>

- </extension>

-   

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
deleted file mode 100644
index 2e178f9aa08..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
deleted file mode 100644
index 21792c90848..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

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

- * are made available under the terms 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  Cedric.dumoulin@lifl.fr - Initial API and implementation

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

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

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

-

-

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

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

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

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

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

-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.utils.TableEditorInput;

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

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

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

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

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.PartInitException;

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

-

-

-/**

- * Abstract class for TableEditor

- * 

- * 

- * 

- */

-public abstract class AbstractEMFNattableEditor extends EditorPart {

-

-	/** the service registry */

-	protected ServicesRegistry servicesRegistry;

-

-	/**

-	 * the table manager

-	 */

-	protected final INattableModelManager tableManager;

-

-	/**

-	 * the part name synchronizer

-	 */

-	private PartNameSynchronizer synchronizer;

-

-	/**

-	 * @param servicesRegistry

-	 * @param rawModel

-	 * 

-	 */

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

-		this.servicesRegistry = servicesRegistry;

-		this.tableManager = new NattableModelManager(rawModel);

-		this.synchronizer = new PartNameSynchronizer(rawModel);

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.facet.widgets.nattable.workbench.editor.NatTableEditor#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)

-	 * 

-	 * @param site

-	 * @param input

-	 * @throws PartInitException

-	 */

-	@Override

-	public void init(final IEditorSite site, final IEditorInput input) throws PartInitException {

-		final TableEditorInput tableEditorInput = new TableEditorInput(this.tableManager.getTable(), getEditingDomain());

-		setSite(site);

-		setInput(tableEditorInput);

-		setPartName(this.tableManager.getTable().getName());

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.facet.widgets.nattable.workbench.editor.NatTableEditor#getEditingDomain()

-	 * 

-	 * @return

-	 */

-	public EditingDomain getEditingDomain() {

-		try {

-			return ServiceUtils.getInstance().getTransactionalEditingDomain(this.servicesRegistry);

-		} catch (final ServiceException e) {

-			Activator.log.error(e);

-		}

-		return null;

-	}

-

-	@Override

-	public void doSave(final IProgressMonitor monitor) {

-		// TODO Auto-generated method stub

-

-	}

-

-	@Override

-	public void doSaveAs() {

-		// TODO Auto-generated method stub

-

-	}

-

-	@Override

-	public boolean isDirty() {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	@Override

-	public boolean isSaveAsAllowed() {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	@Override

-	public void setFocus() {

-		// TODO Auto-generated method stub

-	}

-

-	@Override

-	public void createPartControl(final Composite parent) {

-		this.tableManager.createNattable(parent, SWT.NONE, getSite());

-	}

-

-	@Override

-	public Object getAdapter(final Class adapter) {

-		if(adapter == INattableModelManager.class) {

-			return this.tableManager;

-		}

-		return super.getAdapter(adapter);

-	}

-

-	@Override

-	public void dispose() {

-		this.tableManager.dispose();

-		this.synchronizer.dispose();

-		super.dispose();

-	}

-

-	/**

-	 * A class taking in charge the synchronization of the partName and the table name.

-	 * When table name change, the other is automatically updated.

-	 * 

-	 * 

-	 */

-	public class PartNameSynchronizer {

-

-		/** the papyrus table */

-		private Table papyrusTable;

-

-		/**

-		 * Listener on diagram name change.

-		 */

-		private final Adapter tableNameListener = new AdapterImpl() {

-

-			/**

-			 * 

-			 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)

-			 * 

-			 * @param notification

-			 */

-			@Override

-			public void notifyChanged(final Notification notification) {

-				if(notification.getFeature() == NattableconfigurationPackage.eINSTANCE.getTableNamedElement_Name()) {

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

-				}

-			}

-		};

-

-		/**

-		 * 

-		 * Constructor.

-		 * 

-		 * @param diagram

-		 */

-		public PartNameSynchronizer(final Table papyrusTable) {

-			setTable(papyrusTable);

-		}

-

-		public void dispose() {

-			this.papyrusTable.eAdapters().remove(this.tableNameListener);

-			this.papyrusTable = null;

-		}

-

-		/**

-		 * Change the associated diagram.

-		 * 

-		 * @param papyrusTable

-		 */

-		public void setTable(final Table papyrusTable) {

-			// Remove from old table, if any

-			if(this.papyrusTable != null) {

-				papyrusTable.eAdapters().remove(this.tableNameListener);

-			}

-			// Set new table

-			this.papyrusTable = papyrusTable;

-			// Set editor name

-			setPartName(papyrusTable.getName());

-			// Listen to name change

-			papyrusTable.eAdapters().add(this.tableNameListener);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
deleted file mode 100644
index 683403ffb9e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
deleted file mode 100644
index 12f7306de34..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java
deleted file mode 100644
index 7295bcd5476..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 LIFL & CEA LIST.

- *

- *    

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

- * are made available under the terms 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

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

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

-

-import java.lang.reflect.Constructor;

-

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

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

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

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

-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.nattable.Activator;

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

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

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

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

-

-/**

- * Abstract factory for the NattableEditor

- * 

- * 

- * 

- */

-public abstract class AbstractNattableEditorFactory extends AbstractEditorFactory {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param editorClass

-	 *        the editor class

-	 * @param editorType

-	 *        the type of editor

-	 */

-	public AbstractNattableEditorFactory(Class<?> editorClass, String editorType) {

-		super(editorClass, editorType);

-	}

-

-	/**

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

-	 * 

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

-	 * 

-	 * @param pageIdentifier

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

-	 * @return A model implementing the IPageModel

-	 */

-	public IPageModel createIPageModel(Object pageIdentifier) {

-		return new NattableEditorModel(pageIdentifier, getServiceRegistry());

-	}

-

-	/**

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

-	 * 

-	 * @param pageIdentifier

-	 * @return

-	 */

-	public boolean isPageModelFactoryFor(Object pageIdentifier) {

-		if(pageIdentifier instanceof Table) {

-			return getExpectedType().equals(((Table)pageIdentifier).getTableConfiguration().getType().trim());

-		}

-		return false;

-	}

-

-	/**

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

-	 * 

-	 * @author cedric dumoulin

-	 * 

-	 */

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

-			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

-		 * 

-		 */

-		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

-		 * 

-		 */

-		public EditorActionBarContributor getActionBarContributor() {

-

-			String actionBarId = AbstractNattableEditorFactory.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

-		 * 

-		 */

-		public Object getRawModel() {

-			return this.rawModel;

-		}

-

-		/**

-		 * Get the icon to be shown by Tabs

-		 * 

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

-		 * @return

-		 * 

-		 */

-		public Image getTabIcon() {

-			ImageDescriptor imageDescriptor = getEditorDescriptor().getIcon();

-			if(imageDescriptor == null) {

-				return null;

-			}

-

-			return imageDescriptor.createImage();

-		}

-

-		/**

-		 * Get the title of the Diagram.

-		 * 

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

-		 * @return

-		 * 

-		 */

-		public String getTabTitle() {

-			return this.rawModel.getName();

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
deleted file mode 100644
index a285f1e5203..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 LIFL & CEA LIST.

- *

- *    

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

- * are made available under the terms 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

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

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

-

-import java.lang.reflect.Constructor;

-

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

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

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

-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.nattable.Activator;

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

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

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

-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.core.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)

-	 * 

-	 * @param pageIdentifier

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

-	 * @return A model implementing the IPageModel

-	 */

-	public IPageModel createIPageModel(Object pageIdentifier) {

-		return new NattableEditorModel(pageIdentifier, getServiceRegistry());

-	}

-

-	/**

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

-	 * 

-	 * @param pageIdentifier

-	 * @return

-	 */

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

-			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

-		 * 

-		 */

-		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

-		 * 

-		 */

-		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

-		 * 

-		 */

-		public Object getRawModel() {

-			return this.rawModel;

-		}

-

-		/**

-		 * Get the icon to be shown by Tabs

-		 * 

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

-		 * @return

-		 * 

-		 */

-		public Image getTabIcon() {

-			return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(this.rawModel.getTableConfiguration().getIconPath());

-		}

-

-		/**

-		 * Get the title of the Diagram.

-		 * 

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

-		 * @return

-		 * 

-		 */

-		public String getTabTitle() {

-			return this.rawModel.getName();

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
deleted file mode 100644
index f752dde07fa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 LIFL & CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.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.handlers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-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.transaction.RecordingCommand;

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

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.dialogs.InputDialog;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

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

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

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

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

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

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * 

- * 

- */

-public abstract class AbstractCreateNattableEditorHandler extends AbstractHandler {

-

-

-

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 * 

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		try {

-			runAsTransaction(event);

-		} catch (final ServiceException e) {

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

-		}

-		return null;

-	}

-

-	/**

-	 * Run the command as a transaction. Create a Transaction and delegate the

-	 * command to {@link #doExecute(ServicesRegistry)}.

-	 * 

-	 * @throws ServiceException

-	 * 

-	 */

-	public void runAsTransaction(final ExecutionEvent event) throws ServiceException {

-		//we create a new resourceSet to avoid to load unused config in the resourceset in case of Cancel

-		ResourceSet set = new ResourceSetImpl();

-		Resource res = set.getResource(getTableEditorConfigurationURI(), true);

-		TableConfiguration conf = (TableConfiguration)res.getContents().get(0);

-		String defaultName = conf.getName();

-		// default Value

-		final String name;

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

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

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

-			name = dialog.getValue();

-			final ServicesRegistry serviceRegistry = ServiceUtilsForHandlers.getInstance().getServiceRegistry(event);

-			final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);

-			domain.getCommandStack().execute(new RecordingCommand(domain) {

-

-				@Override

-				protected void doExecute() {

-					try {

-						AbstractCreateNattableEditorHandler.this.doExecute(serviceRegistry, name, this.description);

-					} catch (final NotFoundException e) {

-						Activator.log.error(e);

-					} catch (final ServiceException e) {

-						Activator.log.error(e);

-					}

-

-				}

-			});

-		}

-

-	}

-

-	/**

-	 * Do the execution of the command.

-	 * 

-	 * @param serviceRegistry

-	 * @throws ServiceException

-	 * @throws NotFoundException

-	 */

-	public void doExecute(final ServicesRegistry serviceRegistry, String name, String description) throws ServiceException, NotFoundException {

-

-		final Object editorModel = createEditorModel(serviceRegistry, name, description);

-		// Get the mngr allowing to add/open new editor.

-		final IPageManager pageMngr = ServiceUtils.getInstance().getIPageManager(serviceRegistry);

-		// add the new editor model to the sash.

-		pageMngr.openPage(editorModel);

-

-	}

-

-	/**

-	 * Create a model identifying the editor. This model will be saved with the

-	 * sash

-	 * 

-	 * @return

-	 * @throws ServiceException

-	 * @throws NotFoundException

-	 *         The model where to save the TableInstance is not found.

-	 */

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

-		final TableConfiguration configuration = getDefaultTableEditorConfiguration();

-		assert configuration != null;

-

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

-		// Save the model in the associated resource

-		final PapyrusNattableModel model = (PapyrusNattableModel)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(PapyrusNattableModel.MODEL_ID);

-		model.addPapyrusTable(table);

-		return table;

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the configuration to use for the new table

-	 */

-	protected TableConfiguration getDefaultTableEditorConfiguration() {

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

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

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

-		TableConfiguration tableConfiguration = null;

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

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

-		}

-		return tableConfiguration;

-	}

-

-

-	protected abstract URI getTableEditorConfigurationURI();

-

-	/**

-	 * Get the current MultiDiagramEditor.

-	 * 

-	 * @return

-	 * @throws BackboneException

-	 */

-	protected IMultiDiagramEditor getMultiDiagramEditor() throws BackboneException {

-		return EditorUtils.getMultiDiagramEditorChecked();

-	}

-

-	/**

-	 * Returns the context used to create the table

-	 * 

-	 * @return

-	 *         the context used to create the table or <code>null</code> if not found

-	 * @throws ServiceException

-	 */

-	protected EObject getTableContext() {

-		final List<EObject> selection = getSelection();

-

-		if(!selection.isEmpty()) {

-			return selection.get(0);

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 */

-	protected List<EObject> getSelection() {

-		final List<EObject> selectedElements = new ArrayList<EObject>();

-		final IWorkbenchWindow ww = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

-		if(ww != null) {

-			final ISelection selection = ww.getSelectionService().getSelection();

-			if(selection instanceof IStructuredSelection) {

-

-				final IStructuredSelection structuredSelection = (IStructuredSelection)selection;

-

-				final Iterator<?> it = structuredSelection.iterator();

-				while(it.hasNext()) {

-					final Object object = it.next();

-					if(object instanceof IAdaptable) {

-						final EObject currentEObject = (EObject)((IAdaptable)object).getAdapter(EObject.class);

-

-						if(currentEObject != null) {

-							selectedElements.add(currentEObject);

-						}

-					}

-

-				}

-			}

-		}

-		return selectedElements;

-	}

-

-	/**

-	 * Get the root element associated with canvas.

-	 */

-	protected EObject getRootElement(final Resource modelResource) {

-		EObject rootElement = null;

-		if(modelResource != null && modelResource.getContents() != null && modelResource.getContents().size() > 0) {

-			final Object root = modelResource.getContents().get(0);

-			if(root instanceof EObject) {

-				rootElement = (EObject)root;

-			}

-		}

-		return rootElement;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java
deleted file mode 100644
index 2259bf243b7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableEditorHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

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

-

-import java.util.Hashtable;

-import java.util.List;

-

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;

-

-/**

- * The handler used to create a nattable editor

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class CreateNatTableEditorHandler extends AbstractCreateNattableEditorHandler implements IExecutableExtension {

-

-	/**

-	 * the name of the parameter of the handler

-	 */

-	private static final String TABLE_TYPE_PARAMETER = "tableType"; //$NON-NLS-1$

-

-	/**

-	 * the type of the table to create

-	 */

-	private String type;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public CreateNatTableEditorHandler() {

-		super();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.common.handlers.AbstractCreateNattableEditorHandler2#getTableEditorConfigurationURI()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected URI getTableEditorConfigurationURI() {

-		return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(this.type);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		if(this.type != null) {

-			List<EObject> selection = getSelection();

-			if(selection.size() == 1) {

-				IStatus status = NattableConfigurationRegistry.INSTANCE.canCreateTable(this.type, selection.get(0));

-				setBaseEnabled(status.isOK());

-				return;

-			}

-		}

-		setBaseEnabled(false);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String,

-	 *      java.lang.Object)

-	 * 

-	 * @param config

-	 * @param propertyName

-	 * @param data

-	 * @throws CoreException

-	 */

-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

-		if(data instanceof Hashtable) {

-			this.type = (String)((Hashtable<?, ?>)data).get(TABLE_TYPE_PARAMETER);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/modelresource/PapyrusNattableModel.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/modelresource/PapyrusNattableModel.java
deleted file mode 100644
index cab6c20d82a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/modelresource/PapyrusNattableModel.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 LIFL & CEA LIST.

- *

- *

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

- * are made available under the terms 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

- *

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

-

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

-

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

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

-

-

-

-/**

- * A model used to save data from the {@link DefaultNattableEditor}

- * 

- * @author cedric dumoulin

- * 

- */

-public class PapyrusNattableModel extends AbstractModelWithSharedResource<Table> implements IModel {

-

-	/**

-	 * Model ID.

-	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.infra.nattable.resource.NattableModel"; //$NON-NLS-1$

-

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public PapyrusNattableModel() {

-

-	}

-

-	// Initialize stuff in the model.

-	@Override

-	public void init(ModelSet modelManager) {

-		super.init(modelManager);

-		// nothing to do now

-	}

-

-	/**

-	 * Get the file extension used for this model.

-	 * 

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected String getModelFileExtension() {

-		return NotationModel.NOTATION_FILE_EXTENSION;

-	}

-

-	/**

-	 * Get the identifier used to register this model.

-	 * 

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

-	 * 

-	 * @return

-	 */

-	@Override

-	public String getIdentifier() {

-		return MODEL_ID;

-	}

-

-

-	/**

-	 * Add a new initialized {@link PapyrusTableInstance} to the model.

-	 * 

-	 * @param tableInstance

-	 *        The tableInstance to add.

-	 */

-	public void addPapyrusTable(Table tableInstance) {

-		getResource().getContents().add(tableInstance);

-	}

-

-	/**

-	 * Add a new initialized {@link PapyrusTableInstance} to the model.

-	 * 

-	 * @param tableInstance

-	 *        The tableInstance to add.

-	 */

-	public void removeTable(Table tableInstance) {

-		getResource().getContents().remove(tableInstance);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)

-	 * 

-	 * @param object

-	 * @return

-	 */

-	@Override

-	protected boolean isModelRoot(EObject object) {

-		return false;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
deleted file mode 100644
index 0936d3b045c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************

- * 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.edit.domain.EditingDomain;

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

-

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

-		this.tableInstance = papyrusTable;

-		this.description = papyrusTable.getDescription();

-		this.editingDomain = editingDomain;

-	}

-

-	public Table getPapyrusTableInstance() {

-		return this.tableInstance;

-	}

-

-	public String getDescription() {

-		return this.description;

-	}

-

-	public boolean exists() {

-		return false;

-	}

-

-	public ImageDescriptor getImageDescriptor() {

-		return null;

-	}

-

-	public String getName() {

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

-	}

-

-	public IPersistableElement getPersistable() {

-		return null;

-	}

-

-	public String getToolTipText() {

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

-	}

-

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

-		return null;

-	}

-

-	protected EditingDomain getEditingDomain() {

-		return this.editingDomain;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

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

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

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

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.project
deleted file mode 100644
index 77f4921949f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

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

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

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

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

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

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

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

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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
deleted file mode 100644
index debd79851be..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.emf.facet.widgets.nattable.instance,
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",
- com.google.guava,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,
- org.eclipse.papyrus.infra.nattable.controlmode.commands,
- org.eclipse.papyrus.infra.nattable.controlmode.helpers
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index fe64b83c089..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.controlmode

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Controlmode for Tables (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
deleted file mode 100644
index c053228af5a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               build.properties,\

-               OSGI-INF/,\

-               plugin.pdoc,\

-               about.html

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/plugin.pdoc
deleted file mode 100644
index b39e2bcf7aa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides : &#xD;&#xA;&#x9;-A contribution to the control mode extension point to deal specifically with Papyrus tables.&#xD;&#xA;&#x9;-A handler for the Control command.&#xD;&#xA;&#x9;-A handler for the Uncontrol command.">

-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
deleted file mode 100644
index ae1ffe5ff55..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

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

-      <customControlCommand

-            controlCommand="org.eclipse.papyrus.infra.nattable.controlmode.commands.PapyrusTableControlCommand">

-      </customControlCommand>

-      <customUncontrolCommand

-            uncontrolCommand="org.eclipse.papyrus.infra.nattable.controlmode.commands.PapyrusTableUncontrolCommand">

-      </customUncontrolCommand>

-   </extension>

-

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
deleted file mode 100644
index 6b91a461ac5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

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

-

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

-

-	/**

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

-	}

-

-	/*

-	 * (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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusTableControlCommand.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusTableControlCommand.java
deleted file mode 100644
index 70c0891267b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusTableControlCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

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

-

-import java.util.Iterator;

-

-import org.eclipse.emf.common.command.CompoundCommand;

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

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

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

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

-import org.eclipse.papyrus.infra.services.controlmode.commands.IControlCommand;

-

-

-public class PapyrusTableControlCommand implements IControlCommand {

-

-	public PapyrusTableControlCommand() {

-		// TODO Auto-generated constructor stub

-	}

-

-	public void control(EditingDomain domain, EObject selection, STATE_CONTROL state, Resource source, Resource target, CompoundCommand commandToModify) {

-		switch(state) {

-		case POST_NOTATION:

-			TableMoveHelper.addAllTableMoveCommands(domain, selection, source, target, commandToModify);

-			break;

-		case POST_DI:

-			//FIXME : it should exist a best way to get the SashWindowsMngr

-			SashWindowsMngr windowsMngr = null;

-			final Iterator<Adapter> iter = selection.eAdapters().iterator();

-			while(iter.hasNext() && windowsMngr == null) {

-				final Adapter current = iter.next();

-				if(current.isAdapterForType(SashWindowsMngr.class)) {

-					windowsMngr = (SashWindowsMngr)current.getTarget();

-				}

-			}

-			if(windowsMngr != null) {

-				TableMoveHelper.addAllPageRefTableMoveCommands((TransactionalEditingDomain)domain, selection, source, target, windowsMngr, commandToModify);

-			}

-			break;

-		case POST_MODEL:

-			break;

-		case PRE_DI:

-			break;

-		case PRE_MODEL:

-			break;

-		case PRE_NOTATION:

-			break;

-		default:

-			break;

-		}

-	}

-

-	public boolean provides(EObject selection, STATE_CONTROL state, Resource source, Resource target) {

-		if(state == STATE_CONTROL.POST_NOTATION || state == STATE_CONTROL.POST_DI) {

-			return true;

-		}

-		return false;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusTableUncontrolCommand.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusTableUncontrolCommand.java
deleted file mode 100644
index f69089d3675..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusTableUncontrolCommand.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

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

-

-import org.eclipse.emf.common.command.CompoundCommand;

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

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

-import org.eclipse.papyrus.infra.services.controlmode.commands.IUncontrolCommand;

-

-

-/**

- * Does the exact same thing as PapyrusTableControlCommand, but moves the tables back

- * to the resource they were initially created in.

- * 

- */

-public class PapyrusTableUncontrolCommand implements IUncontrolCommand {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void uncontrol(EditingDomain domain, EObject selection, STATE_CONTROL state, Resource source, Resource target, CompoundCommand commandToModify) {

-		switch(state) {

-		case POST_NOTATION:

-			final ModelSet set = (ModelSet)source.getResourceSet();

-			final Resource sourceNotationFile = set.getAssociatedResource(source, NotationModel.NOTATION_FILE_EXTENSION);

-			final Resource targetNotationFile = set.getAssociatedResource(target, NotationModel.NOTATION_FILE_EXTENSION);

-			TableMoveHelper.addAllTableMoveCommands(domain, selection, sourceNotationFile, targetNotationFile, commandToModify);

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean provides(EObject selection, STATE_CONTROL state, Resource source, Resource target) {

-		if(state == STATE_CONTROL.POST_NOTATION) {

-			return true;

-		}

-		return false;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/TableControlCondition.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/TableControlCondition.java
deleted file mode 100644
index 4e1a9eb20df..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/TableControlCondition.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

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

-

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

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

-import org.eclipse.papyrus.infra.services.controlmode.commands.IControlCondition;

-import org.eclipse.uml2.uml.Element;

-

-

-public class TableControlCondition implements IControlCondition {

-

-	public boolean enableControl(EObject selection) {

-		EObject eObject = EMFHelper.getEObject(selection);

-

-		return eObject instanceof Element;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableMoveHelper.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableMoveHelper.java
deleted file mode 100644
index a9ef6fa79dc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableMoveHelper.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

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

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-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.common.command.CompoundCommand;

-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.resource.Resource;

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

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

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

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

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

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

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.infra.core.sashwindows.di.exception.SashEditorException;

-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;

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

-

-	public static void addAllTableMoveCommands(EditingDomain domain, EObject selection, Resource source, final Resource target, CompoundCommand commandToModify) {

-		if(!(domain instanceof TransactionalEditingDomain)) {

-			throw new RuntimeException("Unable to retrieve the transactional editing domain");//$NON-NLS-1$

-		}

-

-		final Collection<Table> pTables = getPapyrusTableInstances(selection);

-		if(!pTables.isEmpty()) {

-			RecordingCommand cmd = new RecordingCommand((TransactionalEditingDomain)domain) {

-

-				@Override

-				protected void doExecute() {

-					target.getContents().addAll(pTables);

-

-				}

-			};

-			commandToModify.append(cmd);

-		}

-	}

-

-	public static void addAllPageRefTableMoveCommands(TransactionalEditingDomain domain, EObject selection, Resource source, Resource target, final SashWindowsMngr windowsMngr, CompoundCommand commandToModify) {

-		//1. we get the PapyrusTable to move

-		final Collection<Table> tables = getPapyrusTableInstances(selection);

-

-		//2. add pages to the page list

-		for(final Table pTable : tables) {

-			final PageRef pageRef = DiUtils.getPageRef(source, pTable);

-			final ICommand addPageCommand = new AbstractTransactionalCommand(domain, "Add Page Command", null) { //$NON-NLS-1$

-

-				@Override

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

-					windowsMngr.getPageList().addPage(pageRef.getPageIdentifier());

-					try {

-						DiUtils.addPageToTabFolder(windowsMngr, pageRef);

-					} catch (final SashEditorException e) {

-						return CommandResult.newErrorCommandResult(e);

-					}

-					return CommandResult.newOKCommandResult();

-				}

-			};

-

-			commandToModify.append(new GMFtoEMFCommandWrapper(addPageCommand));

-		}

-

-	}

-

-	private static Collection<Table> getPapyrusTableInstances(final EObject selection) {

-		final Collection<Table> pTables = new ArrayList<Table>();

-		Iterable<EObject> allDescendingPapyrusTables = createDescendantTablesIterable(selection);

-		for(EObject eObject : allDescendingPapyrusTables) {

-			if(eObject instanceof Table) {

-				pTables.add((Table)eObject);

-			}

-		}

-		return pTables;

-	}

-

-	/**

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

-

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

-

-			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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/.project
deleted file mode 100644
index d38510b07bd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.doc</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
deleted file mode 100644
index fc4c0fb3ca7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus Table Documentation (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc
-Bundle-Version: 0.10.0.qualifier
-Bundle-Vendor: Eclipse Modeling Project
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/build.properties
deleted file mode 100644
index 31fc0a4172a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = META-INF/,\

-               about.html,\

-               tablemetamodeldocumentation.mediawiki,\

-               plugin.pdoc

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/plugin.pdoc
deleted file mode 100644
index 0c39ddfbfbd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the documentation for the Papyrus Table (the new version of the Papyrus Table).">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/tablemetamodeldocumentation.mediawiki b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/tablemetamodeldocumentation.mediawiki
deleted file mode 100644
index 1c42a44865f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.doc/tablemetamodeldocumentation.mediawiki
+++ /dev/null
@@ -1,98 +0,0 @@
-=Metamodel Description= 

-==CellEditorDeclaration==

-This enumeration allows to describe the way to declare the cell editor in the table : 

-<li>by column </li>

-<li>by row </li>

-<li>by cell </li>

-

-==AxisIndexStyle==

-This enumeration allows to describe how to display the index of the axis : 

-<li>Alphabetic : A, B, C ... Y, Z, AA, AB, ... </li>

-<li>Numeric : 1, 2, 3 </li>

-

-==TableNamedElement==

-abstract object used when an element need to have a name and a description

-

-==TableConfiguration==

-this object is used to configure the table

-

-===Fields=== 

- <li>type : the type of the table</li>

- <li>iconPath : the icon associated to the table</li>

- <li>cellEditorDeclaration : describe how the cell editor will be declared in the table : They can be declared by row, by column or by cells</li>

- <li>rowAxisProviders : the possible axis providers used for rows for this configuration</li>

- <li>columnAxisProviders : the possible axis providers used for the columns for this configuration</li>

- <li>defaultRowAxisProvider : the axis provider used for row just after the table creation </li>

- <li>defaultColumnAxisProvider : the axis provider used for column just after the table creation </li>

- 

- 

- ????rowAxisProviderConfiguration -> a la bonne place ? -> peut-être sur un (local)AbstractAxisProvider?

- ????columnAxisProviderConfiguration -> à la bonne place? -> peut-être sur un (local)AbstractAxisProvider?

- 

- ===Constraints===

- the field defaultRowAxisProvider must references an axis owned by rowAxisProviders

- the field defaultColumnAxisProvider must references an axis owned by columnAxisProviders

-  

-

-==Table==

-This object represents the model of the table used in Papyrus

-===Fields===

-<li>invertAxis : indicates if the rows and the columns are inverted</li>

-<li>tableConfiguration : the configuration used for the table</li>

-<li>currentColumnAxisProvider : the current axis provider used for columns</li>

-<li>currentRowAxisProvider : the current axis provider used for rows</li>

-<li>rowAxisProvidersHistory : an history of the axis provider used for rows</li>

-<li>columnAxisProvidersHistory : an history of the axis provider used for columns</li>

- 

-===Constraints===

-<li>the field currentRowAxisProvider must references an axis owned by rowAxisProviderHistory</li>

-<li>The field currentColumnAxisProvider must references one of axis provider referenced by columnAxisProviderHistory </li>

-<li>the field rowAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several row axis providers in rowAxisProviders</li>

-<li>the field columnAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several column axis providers in columnAxisProviders</li>

-<li> the axis providers owned by columnAxisProviderHistory and rowAxisProviderHistory contains only the axis provider already used by the user. </li>

-

-

-??? localTableConfiguration : must be here?

-

-??? add header in the name of the label configuration????

-==AbstractLabelConfiguration==

-This object allows to store the configuration for the label provider.

-===Fields===

-<li>labelProviderContext : the context to use to find the label provider to use</li>

-

-

-==ObjectLabelProviderConfiguration==

-This label provider can be used for all element displayed in a table

-===Fields===

-<li>displayIcon : indicates if we want display the icon of the object in the header</li>

-<li>displayLabel : indicates if we want display the label of the object in the header</li>

-

-==FeatureLabelProviderConfiguration==

-The label provider used for object representing properties/features of others objects

-===Fields===

-<li>displayIsDerived: indicates if we want display the "/" for the derived feature</li>

-<li>displayType: indicates if we want display the type of the feature</li>

-<li>displayMultiplicity: : indicates if we want display the multiplicity of the feature</li>

-<li>displayName:indicates if the want display the name of the feature</li>

-

-

-==AbstractAxisProvider==

-This class stores in an ordered list the IAxis displayed in rows or in columns

-

-

-=Table Refresh=

- There are 2 kinds of refresh in the tables :

-#a refresh of the appearance of the table <br> This refresh is done after each command executed in the command stack.

-#a refresh of the rows and columns of the table <br> This refresh needs to recalculate the rows and the columns to display before to refresh the table. This refresh is called thanks to listen which listen specific modifications on the model :

-##add/remove/move/... IAxis inside the model of the table, if the table is not synchronized

-##add/remove/move/... elements in the display feature if the table is synchronized

-

-=Refresh Rows/Columns to display=

-A table is managed by 2 CompositeAxisManager one for Rows and one for Columns. These managers refers one or several Axis Manager, identified in the model by an id (AxisManager#managerId). The CompositeAxisManager is used to update the list of the element to display as rows/columns. Here, we need to distinguish 2 kinds of AxisManager

-#the axis manager which provides a contents stored in the model of the table <br> the user can reorder and 'mix'/reoder the elements provided by this kind of AxisManager. <br> The CompositeAxisManager reads the table model to update the list of the elements to display.

-#the axis manager which provides a contents derived of the (UML) model. These one are dynamic, because they doesn't contribute to the table model. <br>the elements can't be mixed with the elements managed by the non-dynamic AxisManager, but they can be reorder 'inside' the Axismanager <br> in case of dynamic and non-dynamic AxisManager used on the same axis, the dynamic will always be displayed at the end of the axis.

-

-The distinction between them is done by a boolean 'isDynamic' stored in the AxisManager class

-

-

-

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/.project
deleted file mode 100644
index 6108308f887..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.feature</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.FeatureBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.FeatureNature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/build.properties
deleted file mode 100644
index e1c31fb3a97..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\

-               build.properties,\

-               epl-v10.html,\

-               license.html,\

-               feature.properties

-src.includes = epl-v10.html,\

-               license.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/epl-v10.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/epl-v10.html
deleted file mode 100644
index cb1073a4bad..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/feature.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/feature.properties
deleted file mode 100644
index 3d80ed179fc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/feature.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/feature.xml
deleted file mode 100644
index bbf0df5ff03..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/feature.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.papyrus.infra.nattable.feature"

-      label="Nattable Feature (Incubation)"

-      version="0.10.0.qualifier"

-      provider-name="Eclipse Modeling Project">

-

-   <copyright url="epl-v10.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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin

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

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.infra.nattable.common"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.infra.nattable.controlmode"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.infra.nattable.model"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.infra.nattable.model.edit"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.infra.nattable.model.editor"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.infra.nattable.modelexplorer"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/license.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/license.html
deleted file mode 100644
index f19c483b9c8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/.classpath
deleted file mode 100644
index cedf0d0d0b5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

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

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

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/.project
deleted file mode 100644
index 478d1af40ce..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.model.edit</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 812591376d9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

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

-Bundle-Version: 0.10.0.qualifier

-Bundle-ClassPath: .

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

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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

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

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

- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider,

- org.eclipse.papyrus.infra.nattable.model.nattable.provider

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

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

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

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

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

-Bundle-ActivationPolicy: lazy

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
deleted file mode 100644
index a6bfdff8b76..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

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

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

-# which accompanies this distribution, and is available at

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

-# 

-# Contributors:

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

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               plugin.pdoc,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_EObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_EObjectLabelProviderConfiguration.gif
deleted file mode 100644
index b67b16a9f33..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_EObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 975c4746dad..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index c06a860ddcd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_AbstractAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_AbstractAxisConfiguration.gif
deleted file mode 100644
index 7c26822d0a3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_AbstractAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_DefaultAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_DefaultAxisConfiguration.gif
deleted file mode 100644
index 0f9364baeeb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_DefaultAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_labelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_labelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 75937a9df9f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_labelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_EStructuralFeatureValueFillingConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_EStructuralFeatureValueFillingConfiguration.gif
deleted file mode 100644
index c2326eff67c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_EStructuralFeatureValueFillingConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_FeatureAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_FeatureAxisConfiguration.gif
deleted file mode 100644
index fdabbc265f7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_FeatureAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_IPasteConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_IPasteConfiguration.gif
deleted file mode 100644
index dfe51cfa69b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_IPasteConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_PasteEObjectConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_PasteEObjectConfiguration.gif
deleted file mode 100644
index 3388fd398d0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_PasteEObjectConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_EStructuralFeatureValueFillingConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_EStructuralFeatureValueFillingConfiguration.gif
deleted file mode 100644
index c2326eff67c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_EStructuralFeatureValueFillingConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_FeatureAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_FeatureAxisConfiguration.gif
deleted file mode 100644
index fdabbc265f7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_FeatureAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_IPasteConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_IPasteConfiguration.gif
deleted file mode 100644
index dfe51cfa69b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_IPasteConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_PasteEObjectConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_PasteEObjectConfiguration.gif
deleted file mode 100644
index 3388fd398d0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_PasteEObjectConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 7839cb59536..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_ObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index c5dab99a76c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_FeatureLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 7839cb59536..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_ObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index c5dab99a76c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d68f55cf8fb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index a3debc34b31..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d68f55cf8fb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index a3debc34b31..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EObjectAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EObjectAxis.gif
deleted file mode 100644
index 5da9e2dfa83..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EStructuralFeatureAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EStructuralFeatureAxis.gif
deleted file mode 100644
index 85e79066b86..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EStructuralFeatureAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_FeatureIdAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_FeatureIdAxis.gif
deleted file mode 100644
index 3ee6d16ecec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_FeatureIdAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_ObjectIdAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_ObjectIdAxis.gif
deleted file mode 100644
index 8fc21667b15..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_ObjectIdAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_EObjectAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_EObjectAxis.gif
deleted file mode 100644
index f7330773c60..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_IdAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_IdAxis.gif
deleted file mode 100644
index 79cec2bc9d9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_IdAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_EObjectAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_EObjectAxis.gif
deleted file mode 100644
index bc2d748f28d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_IdAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_IdAxis.gif
deleted file mode 100644
index b6c9d489e86..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_IdAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateLocalTableHeaderAxisConfiguration_axisManagerConfigurations_AxisManagerConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateLocalTableHeaderAxisConfiguration_axisManagerConfigurations_AxisManagerConfiguration.gif
deleted file mode 100644
index 30d6c628f9c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateLocalTableHeaderAxisConfiguration_axisManagerConfigurations_AxisManagerConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_MasterObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_MasterObjectAxisProvider.gif
deleted file mode 100644
index 4d51bba34ad..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_SlaveObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 8526cb69d7e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
deleted file mode 100644
index c053c91fd2f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif
deleted file mode 100644
index 7b611480bea..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableTester.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableTester.gif
deleted file mode 100644
index ddf43a18246..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableTester.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_MasterObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_MasterObjectAxisProvider.gif
deleted file mode 100644
index 4d51bba34ad..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_SlaveObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 8526cb69d7e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
deleted file mode 100644
index c053c91fd2f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 3d00c57cebc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index 549553f8eab..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 3d00c57cebc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index 549553f8eab..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableHeaderAxisConfiguration_axisManagers_AxisManagerRepresentation.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableHeaderAxisConfiguration_axisManagers_AxisManagerRepresentation.gif
deleted file mode 100644
index 3e4fc3f72c3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableHeaderAxisConfiguration_axisManagers_AxisManagerRepresentation.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_MasterObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_MasterObjectAxisProvider.gif
deleted file mode 100644
index 7b5823c27e1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_SlaveObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 3799bd45b69..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_LocalTableEditorConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_LocalTableEditorConfiguration.gif
deleted file mode 100644
index 26da63c4c85..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_LocalTableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif
deleted file mode 100644
index 207b658fbb9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableEditorConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableEditorConfiguration.gif
deleted file mode 100644
index cbb9f425ab6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d31be0d688d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index cbb9f425ab6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_DefaultContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 011b758fdbc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_EMFFeatureContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index b689e7a00bd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localColumnHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localColumnHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
deleted file mode 100644
index 407220bf47e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localColumnHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localRowHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localRowHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
deleted file mode 100644
index 407220bf47e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localRowHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_MasterObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_MasterObjectAxisProvider.gif
deleted file mode 100644
index 7b5823c27e1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_SlaveObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 3799bd45b69..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d31be0d688d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index cbb9f425ab6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_DefaultContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 011b758fdbc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_EMFFeatureContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index b689e7a00bd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AbstractAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AbstractAxisConfiguration.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AbstractAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerConfiguration.gif
deleted file mode 100644
index 53500daf98e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerRepresentation.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerRepresentation.gif
deleted file mode 100644
index 89ad5da38ab..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerRepresentation.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisConfiguration.gif
deleted file mode 100644
index 106881e5d9b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisProvider.gif
deleted file mode 100644
index c673a5200a5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultContentProvider.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureContentProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureContentProvider.gif
deleted file mode 100644
index 30f0c48da8d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureValueAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index c414fe9f728..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectAxis.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectLabelProviderConfiguration.gif
deleted file mode 100644
index b1f8afa4766..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureAxis.gif
deleted file mode 100644
index c4a8af41844..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureValueFillingConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureValueFillingConfiguration.gif
deleted file mode 100644
index 89ad5da38ab..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureValueFillingConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureAxisConfiguration.gif
deleted file mode 100644
index 739ebbfa6ac..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureIdAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureIdAxis.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureIdAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index c00aedf4135..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IPasteConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IPasteConfiguration.gif
deleted file mode 100644
index 9250fecbffd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IPasteConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IdAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IdAxis.gif
deleted file mode 100644
index e4bc22dd17e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IdAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif
deleted file mode 100644
index b3643da048a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableTester.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableTester.gif
deleted file mode 100644
index e4b530eca17..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableTester.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableEditorConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableEditorConfiguration.gif
deleted file mode 100644
index 5915591825a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableHeaderAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableHeaderAxisConfiguration.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/MasterObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/MasterObjectAxisProvider.gif
deleted file mode 100644
index 904159880b3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectIdAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectIdAxis.gif
deleted file mode 100644
index 9250fecbffd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectIdAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index db7414e9372..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteEObjectConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteEObjectConfiguration.gif
deleted file mode 100644
index a26660ec28f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteEObjectConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/SlaveObjectAxisProvider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/SlaveObjectAxisProvider.gif
deleted file mode 100644
index 33a997a1606..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/Table.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/Table.gif
deleted file mode 100644
index c3370c7ddd5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/Table.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif
deleted file mode 100644
index 90d10f94707..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableEditorConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableEditorConfiguration.gif
deleted file mode 100644
index c414fe9f728..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableHeaderAxisConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableHeaderAxisConfiguration.gif
deleted file mode 100644
index 30f0c48da8d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc
deleted file mode 100644
index 3efa63544f3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the metamodel used by the nattable editor.">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
deleted file mode 100644
index 494b04e2fec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

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

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

-# which accompanies this distribution, and is available at

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

-# 

-# Contributors:

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

-

-pluginName = Papyrus Nattable Model (Incubation)

-providerName = Eclipse Modeling Project

-

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-

-_UI_PropertyDescriptor_description = The {0} of the {1}

-

-_UI_Table_type = Table

-_UI_EObjectAxis_type = EObject Axis

-_UI_IAxis_type = IAxis

-_UI_TableEditorConfiguration_type = Table Editor Configuration

-_UI_LocalTableEditorConfiguration_type = Local Table Editor Configuration

-_UI_IAxisContentsProvider_type = IAxis Contents Provider

-_UI_DefaultContentProvider_type = Default Content Provider

-_UI_EMFFeatureContentProvider_type = EMF Feature Content Provider

-_UI_ISynchronizedAxisContentProvider_type = ISynchronized Axis Content Provider

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_Table_name_feature = Name

-_UI_Table_context_feature = Context

-_UI_Table_description_feature = Description

-_UI_Table_editorConfiguration_feature = Editor Configuration

-_UI_Table_verticalContentProvider_feature = Vertical Content Provider

-_UI_Table_horizontalContentProvider_feature = Horizontal Content Provider

-_UI_EObjectAxis_element_feature = Element

-_UI_TableEditorConfiguration_pastedElementTypeId_feature = Pasted Element Type Id

-_UI_TableEditorConfiguration_pastedElementContainmentFeature_feature = Pasted Element Containment Feature

-_UI_TableEditorConfiguration_javaVerticalContentProviderIds_feature = Java Vertical Content Provider Ids

-_UI_TableEditorConfiguration_javaHorizontalContentProviderIds_feature = Java Horizontal Content Provider Ids

-_UI_TableEditorConfiguration_defaultVerticalContentProvider_feature = Default Vertical Content Provider

-_UI_TableEditorConfiguration_defaultHorizontalContentProvider_feature = Default Horizontal Content Provider

-_UI_LocalTableEditorConfiguration_defaultTableEditorConfiguration_feature = Default Table Editor Configuration

-_UI_LocalTableEditorConfiguration_type_feature = Type

-_UI_DefaultContentProvider_axis_feature = Axis

-_UI_EMFFeatureContentProvider_feature_feature = Feature

-_UI_Unknown_feature = Unspecified

-

-_UI_IdAxis_type = Id Axis

-_UI_IdAxis_id_feature = Id

-_UI_IdAxis_element_feature = Element

-_UI_IAxis_javaContentProviderIds_feature = Java Content Provider Ids

-_UI_IAxisContentsProvider_javaContentProviderIds_feature = Java Content Provider Ids

-_UI_IAxisContentsProvider_initialDirection_feature = Initial Direction

-_UI_AxisDirection_Vertical_literal = VERTICAL

-_UI_AxisDirection_Horizontal_literal = HORIZONTAL

-_UI_Table_invertAxis_feature = Invert Axis

-_UI_TableEditorConfiguration_editorDeclaration_feature = Editor Declaration

-_UI_CellEditorDeclaration_COLUMN_literal = COLUMN

-_UI_CellEditorDeclaration_ROW_literal = ROW

-_UI_CellEditorDeclaration_CELL_literal = CELL

-_UI_AbstractAxisProvider_type = Abstract Axis Provider

-_UI_DefaultAxisProvider_type = Default Axis Provider

-_UI_EMFFeatureValueAxisProvider_type = EMF Feature Value Axis Provider

-_UI_ILabelConfiguration_type = ILabel Configuration

-_UI_FeatureLabelProviderConfiguration_type = Feature Label Provider Configuration

-_UI_Table_verticalAxisProvider_feature = Vertical Axis Provider

-_UI_Table_horizontalAxisProvider_feature = Horizontal Axis Provider

-_UI_TableEditorConfiguration_type_feature = Type

-_UI_AbstractAxisProvider_javaContentProviderIds_feature = Java Content Provider Ids

-_UI_AbstractAxisProvider_labelConfiguration_feature = Label Configuration

-_UI_AbstractAxisProvider_pastedElementTypeId_feature = Pasted Element Type Id

-_UI_AbstractAxisProvider_pastedElementContainmentFeature_feature = Pasted Element Containment Feature

-_UI_DefaultAxisProvider_axis_feature = Axis

-_UI_EMFFeatureValueAxisProvider_feature_feature = Feature

-_UI_ILabelConfiguration_labelProviderContext_feature = Label Provider Context

-_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature = Display Is Derived

-_UI_FeatureLabelProviderConfiguration_displayType_feature = Display Type

-_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature = Display Multiplicity

-_UI_TableEditorConfiguration_defaultVerticalAxisProvider_feature = Default Vertical Axis Provider

-_UI_TableEditorConfiguration_defaultHorizontalAxisProvider_feature = Default Horizontal Axis Provider

-_UI_TableEditorConfiguration_verticalAxisProvider_feature = Vertical Axis Provider

-_UI_TableEditorConfiguration_horizontalAxisProvider_feature = Horizontal Axis Provider

-_UI_EMFFeatureValueAxisProvider_listenFeature_feature = Listen Feature

-_UI_AbstractAxisConfiguration_type = Abstract Axis Configuration

-_UI_DefaultAxisConfiguration_type = Default Axis Configuration

-_UI_AbstractAxisProvider_axisConfiguration_feature = Axis Configuration

-_UI_AbstractAxisConfiguration_labelConfiguration_feature = Label Configuration

-_UI_DefaultAxisConfiguration_indexStyle_feature = Index Style

-_UI_DefaultAxisConfiguration_displayIndex_feature = Display Index

-_UI_DefaultAxisConfiguration_displayLabel_feature = Display Label

-_UI_DefaultAxisConfiguration_displayFilter_feature = Display Filter

-_UI_HeaderIndexStyle_NUMERIC_literal = NUMERIC

-_UI_HeaderIndexStyle_ALPHABETIC_literal = ALPHABETIC

-_UI_EObjectLabelProviderConfiguration_type = EObject Label Provider Configuration

-_UI_EObjectLabelProviderConfiguration_displayIcon_feature = Display Icon

-_UI_AxisIndexStyle_NUMERIC_literal = NUMERIC

-_UI_AxisIndexStyle_ALPHABETIC_literal = ALPHABETIC

-_UI_EObjectLabelProviderConfiguration_displayText_feature = Display Text

-_UI_FeatureLabelProviderConfiguration_displayName_feature = Display Name

-_UI_EObjectLabelProviderConfiguration_displayLabel_feature = Display Label

-_UI_AbstractAxisProvider_javaAxisManagerIds_feature = Java Axis Manager Ids

-_UI_AbstractTableConfiguration_type = Abstract Table Configuration

-_UI_AbstractTableConfiguration_rowAxisProvider_feature = Row Axis Provider

-_UI_AbstractTableConfiguration_columnAxisProvider_feature = Column Axis Provider

-_UI_AbstractTableConfiguration_editorDeclaration_feature = Editor Declaration

-_UI_AbstractTableConfiguration_name_feature = Name

-_UI_AbstractTableConfiguration_description_feature = Description

-_UI_TableConfiguration_type = Table Configuration

-_UI_TableConfiguration_type_feature = Type

-_UI_TableConfiguration_iconPath_feature = Icon Path

-_UI_ObjectLabelProviderConfiguration_type = Object Label Provider Configuration

-_UI_ObjectLabelProviderConfiguration_displayIcon_feature = Display Icon

-_UI_ObjectLabelProviderConfiguration_displayLabel_feature = Display Label

-_UI_AbstractTableCreationTester_type = Abstract Table Creation Tester

-_UI_JavaTableCreationTester_type = Java Table Creation Tester

-_UI_TableConfiguration_creationTester_feature = Creation Tester

-_UI_JavaTableCreationTester_tester_feature = Tester

-_UI_AbstractTableTester_type = Abstract Table Tester

-_UI_JavaTableTester_type = Java Table Tester

-_UI_JavaTableTester_tester_feature = Tester

-_UI_TableNamedElement_type = Table Named Element

-_UI_IMasterAxisProvider_type = IMaster Axis Provider

-_UI_ISlaveAxisProvider_type = ISlave Axis Provider

-_UI_AxisProvider_type = Axis Provider

-_UI_SlaveObjectAxisProvider_type = Slave Object Axis Provider

-_UI_MasterObjectAxisProvider_type = Master Object Axis Provider

-_UI_ILabelProviderConfiguration_type = ILabel Provider Configuration

-_UI_AbstractHeaderAxisConfiguration_type = Abstract Header Axis Configuration

-_UI_AxisManagerRepresentation_type = Axis Manager Representation

-_UI_AxisManagerConfiguration_type = Axis Manager Configuration

-_UI_TableHeaderAxisConfiguration_type = Table Header Axis Configuration

-_UI_LocalTableHeaderAxisConfiguration_type = Local Table Header Axis Configuration

-_UI_IAxisConfiguration_type = IAxis Configuration

-_UI_FeatureAxisConfiguration_type = Feature Axis Configuration

-_UI_IFillingConfiguration_type = IFilling Configuration

-_UI_EStructuralFeatureValueFillingConfiguration_type = EStructural Feature Value Filling Configuration

-_UI_IPasteConfiguration_type = IPaste Configuration

-_UI_PasteEObjectConfiguration_type = Paste EObject Configuration

-_UI_FeatureAxis_type = Feature Axis

-_UI_ObjectAxis_type = Object Axis

-_UI_FeatureIdAxis_type = Feature Id Axis

-_UI_EStructuralFeatureAxis_type = EStructural Feature Axis

-_UI_ObjectIdAxis_type = Object Id Axis

-_UI_Table_tableConfiguration_feature = Table Configuration

-_UI_Table_columnAxisProvidersHistory_feature = Column Axis Providers History

-_UI_Table_rowAxisProvidersHistory_feature = Row Axis Providers History

-_UI_Table_localRowHeaderAxisConfiguration_feature = Local Row Header Axis Configuration

-_UI_Table_localColumnHeaderAxisConfiguration_feature = Local Column Header Axis Configuration

-_UI_Table_currentRowAxisProvider_feature = Current Row Axis Provider

-_UI_Table_currentColumnAxisProvider_feature = Current Column Axis Provider

-_UI_TableNamedElement_description_feature = Description

-_UI_TableNamedElement_name_feature = Name

-_UI_TableConfiguration_cellEditorDeclaration_feature = Cell Editor Declaration

-_UI_TableConfiguration_rowHeaderAxisConfiguration_feature = Row Header Axis Configuration

-_UI_TableConfiguration_columnHeaderAxisConfiguration_feature = Column Header Axis Configuration

-_UI_TableConfiguration_columnAxisProviders_feature = Column Axis Providers

-_UI_TableConfiguration_rowAxisProviders_feature = Row Axis Providers

-_UI_TableConfiguration_defaultRowAxisProvider_feature = Default Row Axis Provider

-_UI_TableConfiguration_defaultColumnAxisProvider_feature = Default Column Axis Provider

-_UI_IMasterAxisProvider_disconnectSlave_feature = Disconnect Slave

-_UI_AxisProvider_axis_feature = Axis

-_UI_AbstractHeaderAxisConfiguration_indexStyle_feature = Index Style

-_UI_AbstractHeaderAxisConfiguration_displayLabel_feature = Display Label

-_UI_AbstractHeaderAxisConfiguration_displayFilter_feature = Display Filter

-_UI_AbstractHeaderAxisConfiguration_displayIndex_feature = Display Index

-_UI_AbstractHeaderAxisConfiguration_ownedLabelConfiguration_feature = Owned Label Configuration

-_UI_AbstractHeaderAxisConfiguration_ownedAxisConfiguration_feature = Owned Axis Configuration

-_UI_AxisManagerRepresentation_axisManagerId_feature = Axis Manager Id

-_UI_AxisManagerRepresentation_labelProviderContext_feature = Label Provider Context

-_UI_AxisManagerRepresentation_headerLabelConfiguration_feature = Header Label Configuration

-_UI_AxisManagerRepresentation_specificAxisConfiguration_feature = Specific Axis Configuration

-_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature = Local Header Label Configuration

-_UI_AxisManagerConfiguration_axisManager_feature = Axis Manager

-_UI_AxisManagerConfiguration_localSpecificConfiguration_feature = Local Specific Configuration

-_UI_TableHeaderAxisConfiguration_axisManagers_feature = Axis Managers

-_UI_LocalTableHeaderAxisConfiguration_axisManagerConfigurations_feature = Axis Manager Configurations

-_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature = Show Only Common Feature

-_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature = Listen Feature

-_UI_PasteEObjectConfiguration_pastedElementId_feature = Pasted Element Id

-_UI_PasteEObjectConfiguration_pasteElementContainementFeature_feature = Paste Element Containement Feature

-_UI_IAxis_manager_feature = Manager

-_UI_IAxis_alias_feature = Alias

-_UI_FeatureAxis_localLabelConfiguration_feature = Local Label Configuration

-_UI_ObjectAxis_localLabelConfiguration_feature = Local Label Configuration

-_UI_EStructuralFeatureAxis_element_feature = Element

-_UI_AxisManagerRepresentation_specificAxisConfigurations_feature = Specific Axis Configurations

-_UI_AxisManagerConfiguration_localSpecificConfigurations_feature = Local Specific Configurations

-_UI_AbstractHeaderAxisConfiguration_ownedLabelConfigurations_feature = Owned Label Configurations

-_UI_AbstractHeaderAxisConfiguration_ownedAxisConfigurations_feature = Owned Axis Configurations

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
deleted file mode 100644
index bea95126aa4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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>

-

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
deleted file mode 100644
index c9de5aa88b6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

-

-import org.eclipse.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
deleted file mode 100644
index f71972af22b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

-

-import org.eclipse.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
deleted file mode 100644
index 9f77133f9a8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-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.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 ItemProviderAdapter

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

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

-			addLocalLabelConfigurationPropertyDescriptor(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 Local Label Configuration feature.

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

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

-	 * @generated

-	 */

-	protected void addLocalLabelConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

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

-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureAxis_localLabelConfiguration_feature", "_UI_FeatureAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

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

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
deleted file mode 100644
index 909689bcf87..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

-

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

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

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

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

- * @generated

- */

-public class FeatureIdAxisItemProvider

-	extends IdAxisItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

-

-			addLocalLabelConfigurationPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Local Label Configuration feature.

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

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

-	 * @generated

-	 */

-	protected void addLocalLabelConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

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

-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureAxis_localLabelConfiguration_feature", "_UI_FeatureAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

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

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
deleted file mode 100644
index ebd6d67e83e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-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.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 ItemProviderAdapter

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

-	public 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
deleted file mode 100644
index 33d61ec170a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.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.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.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 returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	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

-	 */

-	public void dispose() {

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

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

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

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

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
deleted file mode 100644
index f973a3991d0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-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.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 ItemProviderAdapter

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

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

-			addLocalLabelConfigurationPropertyDescriptor(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 Local Label Configuration feature.

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

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

-	 * @generated

-	 */

-	protected void addLocalLabelConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

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

-				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectAxis_localLabelConfiguration_feature", "_UI_ObjectAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

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

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
deleted file mode 100644
index c34ba612abb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

-

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

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

-

-/**

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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

-

-			addLocalLabelConfigurationPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Local Label Configuration feature.

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

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

-	 * @generated

-	 */

-	protected void addLocalLabelConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

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

-				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectAxis_localLabelConfiguration_feature", "_UI_ObjectAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

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

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
deleted file mode 100644
index eb8f3eb6738..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

-

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

-

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

-

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

-

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

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

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

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

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

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

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

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

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

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.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.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 EModelElementItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
deleted file mode 100644
index e01e5526b57..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

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

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

-	public 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
deleted file mode 100644
index bb0f62d12e7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-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.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 ItemProviderAdapter

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

-	public 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
deleted file mode 100644
index 49fa61cee8d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

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

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

-	public 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
deleted file mode 100644
index 2fea36a6407..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-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.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 ItemProviderAdapter

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

-	public 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
deleted file mode 100644
index ac4d28ffa03..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

-

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

-

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

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

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

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

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

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

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

-

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

-

-/**

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

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

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

- * @generated

- */

-public class IPasteConfigurationItemProvider

-	extends ItemProviderAdapter

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

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

-	}

-

-	/**

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

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

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

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

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

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

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

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

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
deleted file mode 100644
index ef36920dd73..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

-import org.eclipse.emf.edit.provider.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index bc8f16ca72b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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 returns the root adapter factory that contains this factory.

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

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

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	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

-	 */

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

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
deleted file mode 100644
index 8441226ecc5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

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

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

-

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

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

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

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

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

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

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

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

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

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-

-/**

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

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

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

- * @generated

- */

-public class PasteEObjectConfigurationItemProvider

-	extends IPasteConfigurationItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

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

-

-			addPastedElementIdPropertyDescriptor(object);

-			addPasteElementContainementFeaturePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Pasted Element Id feature.

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

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

-	 * @generated

-	 */

-	protected void addPastedElementIdPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

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

-				 getString("_UI_PropertyDescriptor_description", "_UI_PasteEObjectConfiguration_pastedElementId_feature", "_UI_PasteEObjectConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Paste Element Containement Feature feature.

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

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

-	 * @generated

-	 */

-	protected void addPasteElementContainementFeaturePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

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

-				 getString("_UI_PropertyDescriptor_description", "_UI_PasteEObjectConfiguration_pasteElementContainementFeature_feature", "_UI_PasteEObjectConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns PasteEObjectConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

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

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

-			getString("_UI_PasteEObjectConfiguration_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(PasteEObjectConfiguration.class)) {

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

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

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
deleted file mode 100644
index c967c348e43..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

-import org.eclipse.emf.edit.provider.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
deleted file mode 100644
index f8f5068885f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.ecore.provider.EModelElementItemProvider;

-

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

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

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

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

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

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

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

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

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

-

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

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

-

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

-

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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

-

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

-

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

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION:

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
deleted file mode 100644
index e801a378a43..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

-import org.eclipse.emf.edit.provider.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

-	}

-

-}

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

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.ComposeableAdapterFactory;

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

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

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

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

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

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

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

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

-

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

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

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

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

- * @generated

- */

-public class MasterObjectAxisProviderItemProvider

-	extends AxisProviderItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

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

-	 * that can be created under this object.

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

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

-	 * @generated

-	 */

-	@Override

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

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
deleted file mode 100644
index 9b521ba9b7d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	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

-	 */

-	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

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	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

-	 */

-	public void dispose() {

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

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

-	}

-

-}

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

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

-

-import org.eclipse.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index 955922b7ca1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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

-	 */

-	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

-	 */

-	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

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * @generated

-	 */

-	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

-	 */

-	public void dispose() {

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

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
deleted file mode 100644
index 6e855d54f1d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-

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

-

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

-

-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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

-		}

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

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

-	}

-

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
deleted file mode 100644
index e7fe33b2de4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-

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

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
deleted file mode 100644
index 3b8164089fa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

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

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

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

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

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

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

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

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ILabelProviderConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ILabelProviderConfigurationItemProvider.java
deleted file mode 100644
index 3f51d8b1fa3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ILabelProviderConfigurationItemProvider.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

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

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.ecore.provider.EModelElementItemProvider;

-

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

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

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

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

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

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

-

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

-

-/**

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

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

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

- * @generated

- */

-public class ILabelProviderConfigurationItemProvider

-	extends EModelElementItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 * @generated

-	 */

-	public ILabelProviderConfigurationItemProvider(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_ILabelProviderConfiguration_type"); //$NON-NLS-1$

-	}

-

-	/**

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

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
deleted file mode 100644
index 1103dd929fd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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 returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public void dispose() {

-		if (featureLabelProviderConfigurationItemProvider != null) featureLabelProviderConfigurationItemProvider.dispose();

-		if (objectLabelProviderConfigurationItemProvider != null) objectLabelProviderConfigurationItemProvider.dispose();

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
deleted file mode 100644
index 37ddf228d1c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ObjectLabelProviderConfigurationItemProvider

-	extends 

-EModelElementItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
deleted file mode 100644
index ff0f3b6917a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.ecore.provider.EModelElementItemProvider;

-

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-

-import org.eclipse.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 EModelElementItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
deleted file mode 100644
index aceba253fdf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.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

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
deleted file mode 100644
index eae26780c2c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	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

-	 */

-	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

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public void dispose() {

-		if (javaTableTesterItemProvider != null) javaTableTesterItemProvider.dispose();

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
deleted file mode 100644
index 74e88d3245b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-

-/**

- * This is the central singleton for the Nattable edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public final class NattableEditPlugin extends EMFPlugin {

-	/**

-	 * 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,

-		   });

-	}

-

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
deleted file mode 100644
index 3fc99014e0c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	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

-	 */

-	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

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public void dispose() {

-		if (tableItemProvider != null) tableItemProvider.dispose();

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
deleted file mode 100644
index 758df71c3e7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-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.nattableconfiguration.provider.TableNamedElementItemProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class TableItemProvider

-	extends TableNamedElementItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableItemProvider(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);

-

-			addContextPropertyDescriptor(object);

-			addTableConfigurationPropertyDescriptor(object);

-			addInvertAxisPropertyDescriptor(object);

-			addCurrentRowAxisProviderPropertyDescriptor(object);

-			addCurrentColumnAxisProviderPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Context feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addContextPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Table_context_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_Table_context_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.TABLE__CONTEXT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Table Configuration feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addTableConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Table_tableConfiguration_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_Table_tableConfiguration_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.TABLE__TABLE_CONFIGURATION,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Invert Axis feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addInvertAxisPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Table_invertAxis_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_Table_invertAxis_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.TABLE__INVERT_AXIS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Current Row Axis Provider feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addCurrentRowAxisProviderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Table_currentRowAxisProvider_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_Table_currentRowAxisProvider_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.TABLE__CURRENT_ROW_AXIS_PROVIDER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Current Column Axis Provider feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addCurrentColumnAxisProviderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Table_currentColumnAxisProvider_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_Table_currentColumnAxisProvider_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.TABLE__CURRENT_COLUMN_AXIS_PROVIDER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * 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(NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);

-			childrenFeatures.add(NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY);

-			childrenFeatures.add(NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION);

-			childrenFeatures.add(NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_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 Table.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Table")); //$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 = ((Table)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_Table_type") : //$NON-NLS-1$

-			getString("_UI_Table_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(Table.class)) {

-			case NattablePackage.TABLE__INVERT_AXIS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-				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

-				(NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY,

-				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY,

-				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY,

-				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY,

-				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION,

-				 NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION,

-				 NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));

-	}

-

-	/**

-	 * 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 == NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY ||

-			childFeature == NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY ||

-			childFeature == NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION ||

-			childFeature == NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION;

-

-		if (qualify) {

-			return getString

-				("_UI_CreateChild_text2", //$NON-NLS-1$

-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

-		}

-		return super.getCreateChildText(owner, feature, child, selection);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/.classpath
deleted file mode 100644
index cedf0d0d0b5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/.project
deleted file mode 100644
index 73a89553556..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.model.editor</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index a84f292b514..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;singleton:=true

-Bundle-Version: 0.10.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin$Implementation

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation,

- org.eclipse.papyrus.infra.nattable.model.nattable.presentation

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.model.edit;visibility:=reexport;bundle-version="0.10.0",

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.emf.edit.ui;visibility:=reexport,

- org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0"

-Bundle-ActivationPolicy: lazy

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
deleted file mode 100644
index c53991b03c5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               plugin.pdoc,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableModelFile.gif
deleted file mode 100644
index 7ede4ac8f48..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisModelFile.gif
deleted file mode 100644
index e5c6e175f7f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisconfigurationModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisconfigurationModelFile.gif
deleted file mode 100644
index b7c1ce53490..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisconfigurationModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisproviderModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisproviderModelFile.gif
deleted file mode 100644
index 682f807656d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisproviderModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableconfigurationModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableconfigurationModelFile.gif
deleted file mode 100644
index 53eb7d4f381..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableconfigurationModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablecontentproviderModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablecontentproviderModelFile.gif
deleted file mode 100644
index 8315589c999..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablecontentproviderModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablelabelproviderModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablelabelproviderModelFile.gif
deleted file mode 100644
index a28ab58d892..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablelabelproviderModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattabletesterModelFile.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattabletesterModelFile.gif
deleted file mode 100644
index e33a30532a9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattabletesterModelFile.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattable.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattable.gif
deleted file mode 100644
index e3b9c14a6a6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattable.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxis.gif
deleted file mode 100644
index caab2147182..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisconfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisconfiguration.gif
deleted file mode 100644
index 84d170d6289..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisconfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisprovider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisprovider.gif
deleted file mode 100644
index 11a22401185..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisprovider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableconfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableconfiguration.gif
deleted file mode 100644
index 5306a816d4c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableconfiguration.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablecontentprovider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablecontentprovider.gif
deleted file mode 100644
index a6b42e7444a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablecontentprovider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablelabelprovider.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablelabelprovider.gif
deleted file mode 100644
index 738d68dbfe7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablelabelprovider.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattabletester.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattabletester.gif
deleted file mode 100644
index a1aafe674b8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattabletester.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc
deleted file mode 100644
index 0f9d81c7a7c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the editor to create table configuration.">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
deleted file mode 100644
index 6fa9b96d89e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-pluginName = Papyrus Nattable Model (Incubation)

-providerName = Eclipse Modeling Project

-

-_UI_NattableEditor_menu = &Nattable Editor

-_UI_NattableconfigurationEditor_menu = &Nattableconfiguration Editor

-_UI_NattablecontentproviderEditor_menu = &Nattablecontentprovider 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 = Example EMF Model 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_NattablecontentproviderModelWizard_label = Nattablecontentprovider Model

-_UI_NattablecontentproviderModelWizard_description = Create a new Nattablecontentprovider model

-

-_UI_NattablecontentproviderEditor_label = Nattablecontentprovider Model Editor

-

-_UI_NattablecontentproviderEditorFilenameDefaultBase = My

-_UI_NattablecontentproviderEditorFilenameExtensions = nattablecontentprovider

-

-_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?

-

-_UI_NattableaxisproviderEditor_menu = &Nattableaxisprovider Editor

-_UI_NattablelabelproviderEditor_menu = &Nattablelabelprovider Editor

-
_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_NattableaxisconfigurationEditor_menu = &Nattableaxisconfiguration Editor

-
_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_NattabletesterEditor_menu = &Nattabletester Editor

-
_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_NattableaxisEditor_menu = &Nattableaxis Editor

-
_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

-


diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
deleted file mode 100644
index 947eab38383..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?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 nattable -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <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.emf.ecore.Wizard.category.ID"

-            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 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.nattable.nattableaxis.presentation.NattableaxisEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated 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.nattable.nattabletester.presentation.NattabletesterEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated nattable -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <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.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/NattableaxisModelFile.gif">

-         <description>%_UI_NattableaxisModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-null

-null

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated 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.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated nattable -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <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.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/NattabletesterModelFile.gif">

-         <description>%_UI_NattabletesterModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-null

-null

-null

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated 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.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated nattable -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <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.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif">

-         <description>%_UI_NattableaxisconfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-null

-null

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated 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.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated nattable -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <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.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/NattablelabelproviderModelFile.gif">

-         <description>%_UI_NattablelabelproviderModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-null

-null

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated 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.nattable.presentation.NattableEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated nattable -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <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.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/NattableconfigurationModelFile.gif">

-         <description>%_UI_NattableconfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-null

-null

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated 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.nattable.nattableconfiguration.presentation.NattableconfigurationEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated nattable -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <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.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/NattableaxisproviderModelFile.gif">

-         <description>%_UI_NattableaxisproviderModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-null

-null</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/requirement.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/requirement.nattableconfiguration
deleted file mode 100644
index b8f5355f7e5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/requirement.nattableconfiguration
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusSysMLRequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.gif" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml.nattable.config.canCreateRequirementTable"/>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfiguration xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <ownedAxisConfiguration xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">

-      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-    </ownedAxisConfiguration>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml.nattable.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfiguration.0" specificAxisConfiguration="//@rowHeaderAxisConfiguration/@ownedAxisConfiguration.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfiguration xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfiguration.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfiguration.0"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
deleted file mode 100644
index eb21cc2cdaf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
deleted file mode 100644
index 08537380e25..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
+++ /dev/null
@@ -1,1806 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.ecore.xmi.XMIResource;

-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.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-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.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() {

-			@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);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

-							}

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				if (updateProblemIndication) {

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-		new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								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())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(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 EcoreItemProviderAdapterFactory());

-		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

-	 */

-	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

-	 */

-	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());

-		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) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			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.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.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 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(XMIResource.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 : NattableaxisEditor.this.editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !NattableaxisEditor.this.editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									NattableaxisEditor.this.savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								NattableaxisEditor.this.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();

-	}

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
deleted file mode 100644
index a2c681e8d70..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-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.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-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.provider.NattableEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * 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

-	 */

-	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

-		 */

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
deleted file mode 100644
index 8271e76f120..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
deleted file mode 100644
index 31cabba6f22..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
+++ /dev/null
@@ -1,1806 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.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.ecore.xmi.XMIResource;

-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.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-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.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() {

-			@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);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

-							}

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				if (updateProblemIndication) {

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-		new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								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())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(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 EcoreItemProviderAdapterFactory());

-		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

-	 */

-	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

-	 */

-	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());

-		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) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			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.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.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 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(XMIResource.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 : NattableaxisconfigurationEditor.this.editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !NattableaxisconfigurationEditor.this.editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									NattableaxisconfigurationEditor.this.savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								NattableaxisconfigurationEditor.this.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();

-	}

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
deleted file mode 100644
index 65d6ab020c0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-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.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-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.provider.NattableEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * 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

-	 */

-	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

-		 */

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
deleted file mode 100644
index 57264318161..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
deleted file mode 100644
index ebb05d41110..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ /dev/null
@@ -1,1806 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.ecore.xmi.XMIResource;

-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.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-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.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() {

-			@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);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

-							}

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				if (updateProblemIndication) {

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-		new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								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())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(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 EcoreItemProviderAdapterFactory());

-		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

-	 */

-	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

-	 */

-	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());

-		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) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			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.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.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 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(XMIResource.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 : NattableaxisproviderEditor.this.editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !NattableaxisproviderEditor.this.editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									NattableaxisproviderEditor.this.savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								NattableaxisproviderEditor.this.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();

-	}

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
deleted file mode 100644
index 1f8fe3b4bdb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-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.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-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.provider.NattableEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * 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

-	 */

-	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

-		 */

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
deleted file mode 100644
index cb2c6fe043b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
deleted file mode 100644
index 9d2f655e62c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ /dev/null
@@ -1,1806 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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.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.ecore.xmi.XMIResource;

-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.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-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.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() {

-			@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);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

-							}

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				if (updateProblemIndication) {

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-		new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								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())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(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 EcoreItemProviderAdapterFactory());

-		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

-	 */

-	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

-	 */

-	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());

-		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) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			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.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.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 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(XMIResource.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 : NattableconfigurationEditor.this.editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !NattableconfigurationEditor.this.editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									NattableconfigurationEditor.this.savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								NattableconfigurationEditor.this.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();

-	}

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
deleted file mode 100644
index e8f820627a2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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.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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-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.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-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.provider.NattableEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * 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

-	 */

-	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

-		 */

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
deleted file mode 100644
index 94d569b42fe..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
deleted file mode 100644
index f0a3de228af..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ /dev/null
@@ -1,1806 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.ecore.xmi.XMIResource;

-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.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-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.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() {

-			@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);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

-							}

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				if (updateProblemIndication) {

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-		new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								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())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(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 EcoreItemProviderAdapterFactory());

-		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

-	 */

-	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

-	 */

-	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());

-		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) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			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.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.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 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(XMIResource.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 : NattablelabelproviderEditor.this.editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !NattablelabelproviderEditor.this.editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									NattablelabelproviderEditor.this.savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								NattablelabelproviderEditor.this.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();

-	}

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
deleted file mode 100644
index 68a71adca41..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-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.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-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.provider.NattableEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * 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

-	 */

-	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

-		 */

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
deleted file mode 100644
index d6477eb7284..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
deleted file mode 100644
index da56817950c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
+++ /dev/null
@@ -1,1806 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.ecore.xmi.XMIResource;

-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.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-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.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() {

-			@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);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

-							}

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				if (updateProblemIndication) {

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-		new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								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())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(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 EcoreItemProviderAdapterFactory());

-		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

-	 */

-	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

-	 */

-	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());

-		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) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			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.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.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 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(XMIResource.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 : NattabletesterEditor.this.editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !NattabletesterEditor.this.editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									NattabletesterEditor.this.savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								NattabletesterEditor.this.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();

-	}

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
deleted file mode 100644
index 872662350fe..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-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.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-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.provider.NattableEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * 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

-	 */

-	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

-		 */

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
deleted file mode 100644
index 2897be94522..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
deleted file mode 100644
index 839d8527333..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ /dev/null
@@ -1,1800 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.ecore.xmi.XMIResource;

-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.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-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() {

-			@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);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

-							}

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				if (updateProblemIndication) {

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								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())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(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 EcoreItemProviderAdapterFactory());

-		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

-	 */

-	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

-	 */

-	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());

-		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) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			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.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.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 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(XMIResource.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 : NattableEditor.this.editingDomain.getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !NattableEditor.this.editingDomain.isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								NattableEditor.this.savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							NattableEditor.this.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();

-	}

-

-	/**

-	 * 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

-	 */

-	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

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
deleted file mode 100644
index 884c5d1ed55..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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;

-

-/**

- * 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,

-			});

-	}

-

-	/**

-	 * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
deleted file mode 100644
index d73b3da88cf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
+++ /dev/null
@@ -1,638 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-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.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-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.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * 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

-	 */

-	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

-		 */

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.classpath
deleted file mode 100644
index 8aeab6132e0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.project
deleted file mode 100644
index a3bcea911c8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.model</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5c09a544840..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1

-encoding//model/DefaultName.ecore=UTF-8

-encoding//model/DefaultName.ecorediag=UTF-8

-encoding//model/nattable.ecorediag=UTF-8

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.ui.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 0aac03f3f7a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,54 +0,0 @@
-eclipse.preferences.version=1

-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false

-sp_cleanup.add_default_serial_version_id=true

-sp_cleanup.add_generated_serial_version_id=false

-sp_cleanup.add_missing_annotations=true

-sp_cleanup.add_missing_deprecated_annotations=true

-sp_cleanup.add_missing_methods=false

-sp_cleanup.add_missing_nls_tags=false

-sp_cleanup.add_missing_override_annotations=true

-sp_cleanup.add_missing_override_annotations_interface_methods=false

-sp_cleanup.add_serial_version_id=false

-sp_cleanup.always_use_blocks=true

-sp_cleanup.always_use_parentheses_in_expressions=false

-sp_cleanup.always_use_this_for_non_static_field_access=true

-sp_cleanup.always_use_this_for_non_static_method_access=false

-sp_cleanup.convert_to_enhanced_for_loop=true

-sp_cleanup.correct_indentation=false

-sp_cleanup.format_source_code=true

-sp_cleanup.format_source_code_changes_only=true

-sp_cleanup.make_local_variable_final=true

-sp_cleanup.make_parameters_final=true

-sp_cleanup.make_private_fields_final=true

-sp_cleanup.make_type_abstract_if_missing_method=false

-sp_cleanup.make_variable_declarations_final=false

-sp_cleanup.never_use_blocks=false

-sp_cleanup.never_use_parentheses_in_expressions=true

-sp_cleanup.on_save_use_additional_actions=true

-sp_cleanup.organize_imports=true

-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false

-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false

-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false

-sp_cleanup.remove_private_constructors=true

-sp_cleanup.remove_trailing_whitespaces=false

-sp_cleanup.remove_trailing_whitespaces_all=true

-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false

-sp_cleanup.remove_unnecessary_casts=true

-sp_cleanup.remove_unnecessary_nls_tags=true

-sp_cleanup.remove_unused_imports=true

-sp_cleanup.remove_unused_local_variables=false

-sp_cleanup.remove_unused_private_fields=true

-sp_cleanup.remove_unused_private_members=false

-sp_cleanup.remove_unused_private_methods=true

-sp_cleanup.remove_unused_private_types=true

-sp_cleanup.sort_members=false

-sp_cleanup.sort_members_all=false

-sp_cleanup.use_blocks=true

-sp_cleanup.use_blocks_only_for_return_and_throw=false

-sp_cleanup.use_parentheses_in_expressions=false

-sp_cleanup.use_this_for_non_static_field_access=true

-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false

-sp_cleanup.use_this_for_non_static_method_access=false

-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
deleted file mode 100644
index 4f26c10ea3a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model;visibility:=reexport;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.papyrus.infra.nattable.model,
- org.eclipse.papyrus.infra.nattable.model.nattable,
- org.eclipse.papyrus.infra.nattable.model.nattable.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.util
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/build.properties
deleted file mode 100644
index bf31424da52..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html,\

-               plugin.pdoc

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore
deleted file mode 100644
index 594f3e95d82..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="defaultname" nsURI="http://defaultname/1.0" nsPrefix="defaultname">

-  <eAnnotations source="récupérer en utilisant le catalogue"/>

-  <eAnnotations source="récupérer en utilisant le catalogue" references="#//uml.nattable.generic/vaChercher #//sysml.nattable.allocation/vaChercher"/>

-  <eAnnotations source="fourni la contribution aux menus" references="#//uml.nattable.generic #//sysml.nattable.allocation"/>

-  <eAnnotations source="fourni tout ce qui est dans le catalogue" references="#//futurWizard"/>

-  <eClassifiers xsi:type="ecore:EClass" name="catalogue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference0" upperBound="-1"

-        eType="#//TableConfig"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TableConfig">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="utilisé par " upperBound="-1"

-        eType="#//EditorPlugins"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="UMLNattableConfig">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="contribue" upperBound="-1"

-        eType="#//catalogue"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="UMLGenericTableConfig"

-        lowerBound="1" eType="#//TableConfig" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SysMLNattableConfig">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="contribue" upperBound="-1"

-        eType="#//catalogue"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="SysMLTableConfig" lowerBound="1"

-        eType="#//TableConfig" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="SysmlAllocationConfig"

-        lowerBound="1" eType="#//TableConfig" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="uml.nattable.generic" eSuperTypes="#//EditorPlugins">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="vaChercher" lowerBound="1"

-        eType="#//catalogue"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="sysml.nattable.allocation" eSuperTypes="#//EditorPlugins">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="vaChercher" lowerBound="1"

-        eType="#//catalogue"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="futurWizard">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference0" lowerBound="1"

-        eType="#//catalogue"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EditorPlugins"/>

-</ecore:EPackage>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag
deleted file mode 100644
index 621d431e91f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_DYfI0Je6EeKr0Yypv4rfLA" type="EcoreTools" name="DefaultName" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_EHMo8Je6EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_EHMo85e6EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EHMo9Je6EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EHMo9Ze6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EHMo9pe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EHMo95e6EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EHMo-Je6EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EHMo-Ze6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EHMo-pe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EHMo-5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EHMo8Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//catalogue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EHMo8pe6EeKr0Yypv4rfLA" x="1040" y="270"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_FWDBsJe6EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_FWDBs5e6EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_FWDBtJe6EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FWDBtZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FWDBtpe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FWDBt5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FWDBuJe6EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FWDBuZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FWDBupe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FWDBu5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_FWDBsZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//TableConfig"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FWDBspe6EeKr0Yypv4rfLA" x="525" y="115" width="160" height="103"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_JRoGcJe6EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_JRoGc5e6EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_JRoGdJe6EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JRoGdZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_JRoGdpe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JRoGd5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_JRoGeJe6EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JRoGeZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_JRoGepe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JRoGe5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_JRoGcZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//UMLNattableConfig"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JRoGcpe6EeKr0Yypv4rfLA" x="465" y="385" width="228" height="78"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_P--vQJe6EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_P--vQ5e6EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_P--vRJe6EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_P--vRZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_P--vRpe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_P--vR5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_P--vSJe6EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_P--vSZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_P--vSpe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_P--vS5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_P--vQZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//SysMLNattableConfig"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P--vQpe6EeKr0Yypv4rfLA" x="970" y="125" width="198" height="83"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_SzJgAJe6EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_SzJgA5e6EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_SzJgBJe6EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SzJgBZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_SzJgBpe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SzJgB5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_SzJgCJe6EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SzJgCZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_SzJgCpe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SzJgC5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_SzJgAZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//uml.nattable.generic"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzJgApe6EeKr0Yypv4rfLA" x="525" y="675" width="181"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Vgw80Je6EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Vgw805e6EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Vgw81Je6EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Vgw81Ze6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vgw81pe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vgw815e6EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Vgw82Je6EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Vgw82Ze6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vgw82pe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vgw825e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Vgw80Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//sysml.nattable.allocation"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vgw80pe6EeKr0Yypv4rfLA" x="895" y="510"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_iQxroJe6EeKr0Yypv4rfLA" type="1003">

-    <children xmi:type="notation:Node" xmi:id="_iQxro5e6EeKr0Yypv4rfLA" type="4007"/>

-    <children xmi:type="notation:Node" xmi:id="_iQxrpJe6EeKr0Yypv4rfLA" type="5007">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_iQxrpZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQxrppe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQxrp5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_iQxroZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="14668776" lineColor="4210752"/>

-    <element xmi:type="ecore:EAnnotation" href="DefaultName.ecore#//%récupérer%20en%20utilisant%20le%20catalogue%.1"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQxrope6EeKr0Yypv4rfLA" x="1135" y="465"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_qDTz0Je6EeKr0Yypv4rfLA" type="1003">

-    <children xmi:type="notation:Node" xmi:id="_qDTz05e6EeKr0Yypv4rfLA" type="4007"/>

-    <children xmi:type="notation:Node" xmi:id="_qDTz1Je6EeKr0Yypv4rfLA" type="5007">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_qDTz1Ze6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_qDTz1pe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qDTz15e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_qDTz0Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="14668776" lineColor="4210752"/>

-    <element xmi:type="ecore:EAnnotation" href="DefaultName.ecore#//%fourni%20la%20contribution%20aux%20menus%"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qDTz0pe6EeKr0Yypv4rfLA" x="790" y="590"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_t2jb8Je6EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_t2tM8Je6EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_t2tM8Ze6EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_t2tM8pe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_t2tM85e6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t2tM9Je6EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_t2tM9Ze6EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_t2tM9pe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_t2tM95e6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t2tM-Je6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_t2jb8Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//futurWizard"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t2jb8pe6EeKr0Yypv4rfLA" x="1235" y="255" width="172"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_yNzwEJe6EeKr0Yypv4rfLA" type="1003">

-    <children xmi:type="notation:Node" xmi:id="_yNzwE5e6EeKr0Yypv4rfLA" type="4007"/>

-    <children xmi:type="notation:Node" xmi:id="_yNzwFJe6EeKr0Yypv4rfLA" type="5007">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_yNzwFZe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_yNzwFpe6EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yNzwF5e6EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_yNzwEZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="14668776" lineColor="4210752"/>

-    <element xmi:type="ecore:EAnnotation" href="DefaultName.ecore#//%fourni%20tout%20ce%20qui%20est%20dans%20le%20catalogue%"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yNzwEpe6EeKr0Yypv4rfLA" x="1560" y="260"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ETjYAJe8EeKr0Yypv4rfLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ETjYA5e8EeKr0Yypv4rfLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ETjYBJe8EeKr0Yypv4rfLA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ETjYBZe8EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ETjYBpe8EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ETjYB5e8EeKr0Yypv4rfLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ETjYCJe8EeKr0Yypv4rfLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ETjYCZe8EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ETjYCpe8EeKr0Yypv4rfLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ETjYC5e8EeKr0Yypv4rfLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ETjYAZe8EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//EditorPlugins"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETjYApe8EeKr0Yypv4rfLA" x="541" y="522"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_DYfI0Ze6EeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="DefaultName.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_HYhPwJe6EeKr0Yypv4rfLA" type="3002" source="_EHMo8Je6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_HYhPxJe6EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HYhPxZe6EeKr0Yypv4rfLA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_HYhPxpe6EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HYhPx5e6EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_HYhPwZe6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_HYhPwpe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//catalogue/EReference0"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HYhPw5e6EeKr0Yypv4rfLA" points="[-50, 0, 490, 129]$[-355, 0, 185, 129]$[-461, -74, 79, 55]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HYhPyJe6EeKr0Yypv4rfLA" id="(0.1625,0.4583333333333333)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_UbldcJe6EeKr0Yypv4rfLA" type="3002" source="_SzJgAJe6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_UblddJe6EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_UblddZe6EeKr0Yypv4rfLA" x="-139" y="-2"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ublddpe6EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ubldd5e6EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_UbldcZe6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ubldcpe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//uml.nattable.generic/vaChercher"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ubldc5e6EeKr0Yypv4rfLA" points="[46, 0, -429, 381]$[1147, 11, 672, 392]$[1147, -283, 672, 98]$[475, -283, 0, 98]$[475, -372, 0, 9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbldeJe6EeKr0Yypv4rfLA" id="(0.7458563535911602,0.20930232558139536)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_k3tcMJe7EeKr0Yypv4rfLA" id="(0.9313725490196079,0.7906976744186046)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Xiye8Je6EeKr0Yypv4rfLA" type="3002" source="_Vgw80Je6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_Xiye9Je6EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Xiye9Ze6EeKr0Yypv4rfLA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Xiye9pe6EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Xiye95e6EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Xiye8Ze6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Xiye8pe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//sysml.nattable.allocation/vaChercher"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xiye85e6EeKr0Yypv4rfLA" points="[-4, -16, 92, 409]$[-94, -446, 2, -21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xiye-Je6EeKr0Yypv4rfLA" id="(0.8098159509202454,0.3953488372093023)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xiye-Ze6EeKr0Yypv4rfLA" id="(0.4215686274509804,0.8372093023255814)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_kvETAJe6EeKr0Yypv4rfLA" type="3001" source="_iQxroJe6EeKr0Yypv4rfLA" target="_UbldcJe6EeKr0Yypv4rfLA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kvETAZe6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_kvETApe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kvETA5e6EeKr0Yypv4rfLA" points="[-49, 18, 279, -102]$[298, -109, 626, -229]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vw1HMJe8EeKr0Yypv4rfLA" id="(0.9699570815450643,0.4)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kvOEAJe6EeKr0Yypv4rfLA" id="(0.20689655172413793,0.8288508557457213)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_mVSC4Je6EeKr0Yypv4rfLA" type="3001" source="_iQxroJe6EeKr0Yypv4rfLA" target="_Xiye8Je6EeKr0Yypv4rfLA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_mVSC4Ze6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_mVSC4pe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mVSC45e6EeKr0Yypv4rfLA" points="[115, 13, -550, -67]$[694, 84, 29, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W5R9AJe8EeKr0Yypv4rfLA" id="(0.034334763948497854,0.7)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mVSC5Je6EeKr0Yypv4rfLA" id="(0.8369098712446352,0.8596059113300493)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_sa6kYJe6EeKr0Yypv4rfLA" type="3001" source="_qDTz0Je6EeKr0Yypv4rfLA" target="_SzJgAJe6EeKr0Yypv4rfLA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_sa6kYZe6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_sa6kYpe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sa6kY5e6EeKr0Yypv4rfLA" points="[-1, -18, 2, 90]$[-1, -116, 2, -8]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sa6kZJe6EeKr0Yypv4rfLA" id="(0.5359116022099447,0.20930232558139536)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_s0NOIJe6EeKr0Yypv4rfLA" type="3001" source="_qDTz0Je6EeKr0Yypv4rfLA" target="_Vgw80Je6EeKr0Yypv4rfLA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_s0NOIZe6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_s0NOIpe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s0NOI5e6EeKr0Yypv4rfLA" points="[51, -8, -358, 62]$[410, -60, 1, 10]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s0NOJJe6EeKr0Yypv4rfLA" id="(0.7668161434977578,0.575)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s0NOJZe6EeKr0Yypv4rfLA" id="(0.4539877300613497,0.7674418604651163)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_wsqGYJe6EeKr0Yypv4rfLA" type="3002" source="_t2jb8Je6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_wsqGZJe6EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wsqGZZe6EeKr0Yypv4rfLA" x="-34" y="-56"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_wsqGZpe6EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wsqGZ5e6EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_wsqGYZe6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_wsqGYpe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//futurWizard/EReference0"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wsqGY5e6EeKr0Yypv4rfLA" points="[-19, 21, 91, -99]$[-103, 100, 7, -20]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2XXmcJe6EeKr0Yypv4rfLA" id="(0.9607843137254902,0.37209302325581395)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_01Bp8Je6EeKr0Yypv4rfLA" type="3001" source="_yNzwEJe6EeKr0Yypv4rfLA" target="_t2jb8Je6EeKr0Yypv4rfLA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_01Bp8Ze6EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_01Bp8pe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_01Bp85e6EeKr0Yypv4rfLA" points="[-4, -23, 43, 61]$[21, -63, 68, 21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_01Bp9Je6EeKr0Yypv4rfLA" id="(0.18631178707224336,0.65)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_d2teoJe7EeKr0Yypv4rfLA" type="3002" source="_P--vQJe6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_d2tepJe7EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_d2tepZe7EeKr0Yypv4rfLA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_d2teppe7EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_d2tep5e7EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_d2teoZe7EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_d2teope7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//SysMLNattableConfig/contribue"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d2teo5e7EeKr0Yypv4rfLA" points="[1, 8, -9, -103]$[11, 102, 1, -9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d23PoJe7EeKr0Yypv4rfLA" id="(0.5656565656565656,0.8823529411764706)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d23PoZe7EeKr0Yypv4rfLA" id="(0.35294117647058826,0.23255813953488372)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ftI0wJe7EeKr0Yypv4rfLA" type="3002" source="_JRoGcJe6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_ftI0xJe7EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ftI0xZe7EeKr0Yypv4rfLA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ftI0xpe7EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ftI0x5e7EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ftI0wZe7EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ftI0wpe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//UMLNattableConfig/contribue"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ftI0w5e7EeKr0Yypv4rfLA" points="[99, 38, -269, -102]$[369, 122, 1, -18]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ftI0yJe7EeKr0Yypv4rfLA" id="(0.16666666666666666,0.4418604651162791)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_rmZhwJe7EeKr0Yypv4rfLA" type="3002" source="_JRoGcJe6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_rmjSwJe7EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rmjSwZe7EeKr0Yypv4rfLA" x="-92" y="78"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_rmjSwpe7EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rmjSw5e7EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_rmZhwZe7EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_rmZhwpe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//UMLNattableConfig/UMLGenericTableConfig"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rmZhw5e7EeKr0Yypv4rfLA" points="[6, 8, -68, -86]$[75, 82, 1, -12]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rmjSxJe7EeKr0Yypv4rfLA" id="(0.37719298245614036,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rmjSxZe7EeKr0Yypv4rfLA" id="(0.175,0.2708333333333333)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_u62VEJe7EeKr0Yypv4rfLA" type="3002" source="_P--vQJe6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_u62VFJe7EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_u62VFZe7EeKr0Yypv4rfLA" x="-55" y="-9"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_u62VFpe7EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_u62VF5e7EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_u62VEZe7EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_u62VEpe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//SysMLNattableConfig/SysMLTableConfig"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u62VE5e7EeKr0Yypv4rfLA" points="[-37, 21, 222, -137]$[-338, 153, -79, -5]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3AbVEJe7EeKr0Yypv4rfLA" id="(0.015151515151515152,0.23255813953488372)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4rZCEJe7EeKr0Yypv4rfLA" id="(0.9125,0.24271844660194175)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_wEpOsJe7EeKr0Yypv4rfLA" type="3002" source="_P--vQJe6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_wEpOtJe7EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wEpOtZe7EeKr0Yypv4rfLA" x="-56" y="-13"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_wEpOtpe7EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wEpOt5e7EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_wEpOsZe7EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_wEpOspe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//SysMLNattableConfig/SysmlAllocationConfig"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wEpOs5e7EeKr0Yypv4rfLA" points="[-29, 21, 230, -137]$[-180, 155, 79, -3]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FuTewJe8EeKr0Yypv4rfLA" type="3003" source="_SzJgAJe6EeKr0Yypv4rfLA" target="_ETjYAJe8EeKr0Yypv4rfLA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FuTewZe8EeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FuTewpe8EeKr0Yypv4rfLA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FuTew5e8EeKr0Yypv4rfLA" points="[-40, -20, 143, 73]$[-177, -72, 6, 21]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_GM9JoJe8EeKr0Yypv4rfLA" type="3003" source="_Vgw80Je6EeKr0Yypv4rfLA" target="_ETjYAJe8EeKr0Yypv4rfLA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_GM9JoZe8EeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_GM9Jope8EeKr0Yypv4rfLA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GM9Jo5e8EeKr0Yypv4rfLA" points="[-80, -7, 1239, 111]$[-1269, -117, 50, 1]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_KtkOEJe8EeKr0Yypv4rfLA" type="3002" source="_FWDBsJe6EeKr0Yypv4rfLA" target="_ETjYAJe8EeKr0Yypv4rfLA">

-    <children xmi:type="notation:Node" xmi:id="_KtkOFJe8EeKr0Yypv4rfLA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KtkOFZe8EeKr0Yypv4rfLA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_KtkOFpe8EeKr0Yypv4rfLA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KtkOF5e8EeKr0Yypv4rfLA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KtkOEZe8EeKr0Yypv4rfLA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_KtkOEpe8EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//TableConfig/utilisé%20par%20"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KtkOE5e8EeKr0Yypv4rfLA" points="[-86, 0, -66, -338]$[-361, 0, -341, -338]$[-361, 331, -341, -7]$[-70, 331, -50, -7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KtkOGJe8EeKr0Yypv4rfLA" id="(0.55,0.883495145631068)"/>

-  </edges>

-</notation:Diagram>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
deleted file mode 100644
index f73102d0407..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="nattable" nsURI="http://www.eclipse.org/papyrus/nattable/model"

-    nsPrefix="nattable">

-  <eClassifiers xsi:type="ecore:EClass" name="Table" eSuperTypes="#//nattableconfiguration/TableNamedElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="context" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableConfiguration" lowerBound="1"

-        eType="#//nattableconfiguration/TableConfiguration"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="invertAxis" lowerBound="1"

-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-        defaultValueLiteral="false"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProvidersHistory"

-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProvidersHistory"

-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="localRowHeaderAxisConfiguration"

-        eType="#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="localColumnHeaderAxisConfiguration"

-        eType="#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentRowAxisProvider"

-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentColumnAxisProvider"

-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>

-  </eClassifiers>

-  <eSubpackages name="nattableconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-      nsPrefix="nattableconfiguration">

-    <eClassifiers xsi:type="ecore:EClass" name="TableNamedElement" abstract="true"

-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="TableConfiguration" eSuperTypes="#//nattableconfiguration/TableNamedElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="creationTester" eType="#//nattabletester/AbstractTableTester"

-          containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cellEditorDeclaration"

-          lowerBound="1" eType="#//nattableconfiguration/CellEditorDeclaration" defaultValueLiteral="COLUMN"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowHeaderAxisConfiguration"

-          lowerBound="1" eType="#//nattableaxisconfiguration/TableHeaderAxisConfiguration"

-          containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnHeaderAxisConfiguration"

-          lowerBound="1" eType="#//nattableaxisconfiguration/TableHeaderAxisConfiguration"

-          containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProviders"

-          lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"

-          containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProviders" lowerBound="1"

-          upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultRowAxisProvider"

-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultColumnAxisProvider"

-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="CellEditorDeclaration">

-      <eLiterals name="COLUMN"/>

-      <eLiterals name="ROW" value="1"/>

-      <eLiterals name="CELL" value="2"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="nattableaxisprovider" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-      nsPrefix="nattableaxisprovider">

-    <eClassifiers xsi:type="ecore:EClass" name="AbstractAxisProvider" abstract="true"

-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement #//nattableconfiguration/TableNamedElement">

-      <eOperations name="getAxis" upperBound="-1" eType="#//nattableaxis/IAxis"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IMasterAxisProvider" abstract="true"

-        interface="true" eSuperTypes="#//nattableaxisprovider/AxisProvider">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="disconnectSlave" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ISlaveAxisProvider" abstract="true"

-        interface="true" eSuperTypes="#//nattableaxisprovider/AxisProvider"/>

-    <eClassifiers xsi:type="ecore:EClass" name="AxisProvider" abstract="true" eSuperTypes="#//nattableaxisprovider/AbstractAxisProvider">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axis" upperBound="-1"

-          eType="#//nattableaxis/IAxis" containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="SlaveObjectAxisProvider" eSuperTypes="#//nattableaxisprovider/ISlaveAxisProvider"/>

-    <eClassifiers xsi:type="ecore:EClass" name="MasterObjectAxisProvider" eSuperTypes="#//nattableaxisprovider/IMasterAxisProvider"/>

-  </eSubpackages>

-  <eSubpackages name="nattablelabelprovider" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-      nsPrefix="nattablelabelprovider">

-    <eClassifiers xsi:type="ecore:EClass" name="ILabelProviderConfiguration" abstract="true"

-        interface="true" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement"/>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelProviderConfiguration"

-        eSuperTypes="#//nattablelabelprovider/ObjectLabelProviderConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIsDerived" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayType" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayMultiplicity"

-          lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectLabelProviderConfiguration"

-        eSuperTypes="#//nattablelabelprovider/ILabelProviderConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIcon" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="nattableaxisconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-      nsPrefix="nattableaxisconfiguration">

-    <eClassifiers xsi:type="ecore:EClass" name="AbstractHeaderAxisConfiguration" abstract="true"

-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="indexStyle" lowerBound="1"

-          eType="#//nattableaxisconfiguration/AxisIndexStyle"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayFilter" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="false"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIndex" lowerBound="1"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

-          defaultValueLiteral="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="ownedLabelConfigurations"

-          upperBound="-1" eType="#//nattablelabelprovider/ILabelProviderConfiguration"

-          containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAxisConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"

-          containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="AxisManagerRepresentation">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="axisManagerId" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelProviderContext"

-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="headerLabelConfiguration"

-          lowerBound="1" eType="#//nattablelabelprovider/ILabelProviderConfiguration"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="specificAxisConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="AxisManagerConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localHeaderLabelConfiguration"

-          eType="#//nattablelabelprovider/ILabelProviderConfiguration"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManager" lowerBound="1"

-          eType="#//nattableaxisconfiguration/AxisManagerRepresentation"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localSpecificConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="TableHeaderAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagers" lowerBound="1"

-          upperBound="-1" eType="#//nattableaxisconfiguration/AxisManagerRepresentation"

-          containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="LocalTableHeaderAxisConfiguration"

-        eSuperTypes="#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagerConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/AxisManagerConfiguration"

-          containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IAxisConfiguration" abstract="true"

-        interface="true"/>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/IAxisConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="showOnlyCommonFeature"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IFillingConfiguration" abstract="true"

-        interface="true" eSuperTypes="#//nattableaxisconfiguration/IAxisConfiguration"/>

-    <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeatureValueFillingConfiguration"

-        eSuperTypes="#//nattableaxisconfiguration/IFillingConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="listenFeature" lowerBound="1"

-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IPasteConfiguration" eSuperTypes="#//nattableaxisconfiguration/IAxisConfiguration"/>

-    <eClassifiers xsi:type="ecore:EClass" name="PasteEObjectConfiguration" eSuperTypes="#//nattableaxisconfiguration/IPasteConfiguration">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="pastedElementId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="pasteElementContainementFeature"

-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="AxisIndexStyle">

-      <eLiterals name="ALPHABETIC" value="1" literal="ALPHABETIC"/>

-      <eLiterals name="NUMERIC" literal="NUMERIC"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="nattabletester" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"

-      nsPrefix="nattabletester">

-    <eClassifiers xsi:type="ecore:EClass" name="AbstractTableTester" abstract="true"

-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">

-      <eOperations name="getTester" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="JavaTableTester" eSuperTypes="#//nattabletester/AbstractTableTester">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="tester" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="nattableaxis" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-      nsPrefix="nattableaxis">

-    <eClassifiers xsi:type="ecore:EClass" name="IAxis" abstract="true" interface="true">

-      <eOperations name="getElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-      <eOperations name="getLocalLabelConfiguration" eType="#//nattablelabelprovider/ILabelProviderConfiguration"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="manager" lowerBound="1"

-          eType="#//nattableaxisconfiguration/AxisManagerRepresentation"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IdAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="EObjectAxis" eSuperTypes="#//nattableaxis/ObjectAxis">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"

-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"

-          eType="#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"

-          eType="#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/FeatureAxis"/>

-    <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeatureAxis" eSuperTypes="#//nattableaxis/FeatureAxis">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"

-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/ObjectAxis"/>

-  </eSubpackages>

-</ecore:EPackage>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
deleted file mode 100644
index 1b799c62dcf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
+++ /dev/null
@@ -1,1041 +0,0 @@
-<?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="_EhRWcKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc8aHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EhRWdKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWdaHtEeKNUa7kbzEWsw" x="-31" y="24"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EhRWdqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWd6HtEeKNUa7kbzEWsw" y="-16"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWcaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWcqHtEeKNUa7kbzEWsw" 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="_EhRWc6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 286]$[0, -286, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHaHtEeKNUa7kbzEWsw" id="(0.07894736842105263,0.19318181818181818)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHqHtEeKNUa7kbzEWsw" id="(0.9893617021276596,0.6344086021505376)"/>

-  </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="_EhRWhKHtEeKNUa7kbzEWsw" type="3002" source="_EfVdCaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EhRWiKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWiaHtEeKNUa7kbzEWsw" x="-817" y="342"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EhRWiqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWi6HtEeKNUa7kbzEWsw" x="-725" y="295"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWhaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWhqHtEeKNUa7kbzEWsw" 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="_EhRWh6HtEeKNUa7kbzEWsw" points="[-11, -7, 1191, 179]$[-886, -7, 316, 179]$[-1202, -186, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-aHtEeKNUa7kbzEWsw" id="(0.057692307692307696,0.19327731092436976)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-qHtEeKNUa7kbzEWsw" id="(0.8297872340425532,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="_rlo-QKH3EeKNUa7kbzEWsw" type="3002" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_rlVcQKH3EeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_rlo-RKH3EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rlo-RaH3EeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_rlo-RqH3EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rlo-R6H3EeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_rlo-QaH3EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_rlo-QqH3EeKNUa7kbzEWsw" 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="_rlo-Q6H3EeKNUa7kbzEWsw" points="[-20, -29, 1099, 1596]$[-1118, -1624, 1, 1]"/>

-  </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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
deleted file mode 100644
index 8e695a71812..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;&#x9;Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.infra.nattable.model/src-gen" editDirectory="/org.eclipse.papyrus.infra.nattable.model.edit/src-gen"

-    editorDirectory="/org.eclipse.papyrus.infra.nattable.model.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.nattable.model"

-    modelName="Nattable" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    testsDirectory="/org.eclipse.papyrus.infra.nattable.model.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>nattable.ecore</foreignModel>

-  <genPackages prefix="Nattable" basePackage="org.eclipse.papyrus.infra.nattable.model"

-      disposableProviderFactory="true" ecorePackage="nattable.ecore#/">

-    <genClasses ecoreClass="nattable.ecore#//Table">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//Table/name"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/context"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//Table/description"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/editorConfiguration"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/verticalContentProvider"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/horizontalContentProvider"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="nattable.ecore#//IAxisContentsProvider">

-      <genOperations ecoreOperation="nattable.ecore#//IAxisContentsProvider/getAxis"/>

-    </genClasses>

-    <genClasses ecoreClass="nattable.ecore#//DefaultContentProvider">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//DefaultContentProvider/axis"/>

-    </genClasses>

-    <genClasses ecoreClass="nattable.ecore#//EObjectAxis">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nattable.ecore#//EObjectAxis/element"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="nattable.ecore#//IAxis">

-      <genOperations ecoreOperation="nattable.ecore#//IAxis/getElement"/>

-    </genClasses>

-    <genClasses ecoreClass="nattable.ecore#//EMFFeatureContentProvider">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nattable.ecore#//EMFFeatureContentProvider/feature"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="nattable.ecore#//ISynchronizedAxisContentProvider"/>

-    <nestedGenPackages prefix="Tableconfiguration" basePackage="org.eclipse.papyrus.infra.nattable.model"

-        disposableProviderFactory="true" ecorePackage="nattable.ecore#//tableconfiguration">

-      <genClasses ecoreClass="nattable.ecore#//tableconfiguration/TableEditorConfiguration">

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/TableEditorConfiguration/pastedElementTypeId"/>

-        <genFeatures notify="false" createChild="false" propertySortChoices="true"

-            ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/TableEditorConfiguration/pastedElementContainmentFeature"/>

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/TableEditorConfiguration/javaVerticalContentProviderIds"/>

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/TableEditorConfiguration/javaHorizontalContentProviderIds"/>

-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/TableEditorConfiguration/defaultVerticalContentProvider"/>

-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/TableEditorConfiguration/defaultHorizontalContentProvider"/>

-      </genClasses>

-      <genClasses ecoreClass="nattable.ecore#//tableconfiguration/LocalTableEditorConfiguration">

-        <genFeatures notify="false" createChild="false" propertySortChoices="true"

-            ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/LocalTableEditorConfiguration/defaultTableEditorConfiguration"/>

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/LocalTableEditorConfiguration/type"/>

-      </genClasses>

-    </nestedGenPackages>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
deleted file mode 100644
index db85685b5a0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
+++ /dev/null
@@ -1,336 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
deleted file mode 100644
index 0608de992ed..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
+++ /dev/null
@@ -1,295 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
deleted file mode 100644
index 44fd09ed8ac..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
+++ /dev/null
@@ -1,292 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc
deleted file mode 100644
index 3efa63544f3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the metamodel used by the nattable editor.">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.properties
deleted file mode 100644
index 5d5f67f2361..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-pluginName = Papyrus Nattable Model (Incubation)

-providerName = Eclipse Modeling Project

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.xml
deleted file mode 100644
index 4b776100e16..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/plugin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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>

-

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java
deleted file mode 100644
index 93374afa3cd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model;

-

-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.model"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(final BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(final 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
deleted file mode 100644
index aee640ac135..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
deleted file mode 100644
index 296921f5375..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-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"

- * @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>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>Table Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__TABLE_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * 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 + 2;

-

-	/**

-	 * 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 + 3;

-

-	/**

-	 * 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 + 4;

-

-	/**

-	 * 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 + 5;

-

-	/**

-	 * 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 + 6;

-

-	/**

-	 * 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 + 7;

-

-	/**

-	 * 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 + 8;

-

-	/**

-	 * 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 + 9;

-

-	/**

-	 * 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 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#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 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>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();

-

-	}

-

-} //NattablePackage

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
deleted file mode 100644
index 83cb7def568..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-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.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 -->

- *

- * <p>

- * The following features are supported:

- * <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#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>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable()

- * @model

- * @generated

- */

-public interface Table extends TableNamedElement {

-	/**

-	 * Returns the value of the '<em><b>Context</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Context</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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

-	 * @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>Table Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Table 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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Invert Axis</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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 -->

-	 * <p>

-	 * If the meaning of the '<em>Column Axis Providers History</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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Row Axis Providers History</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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Local Row Header Axis 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 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 -->

-	 * <p>

-	 * If the meaning of the '<em>Local Column Header Axis 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 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 -->

-	 * <p>

-	 * If the meaning of the '<em>Current Row Axis Provider</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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 -->

-	 * <p>

-	 * If the meaning of the '<em>Current Column Axis Provider</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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);

-

-} // Table

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
deleted file mode 100644
index 01e795301c9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-/**

- * <!-- 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

-	 */

-	public Table createTable() {

-		TableImpl table = new TableImpl();

-		return table;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
deleted file mode 100644
index 81b30297cdc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.EcorePackage;

-

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-

-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.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.nattabletester.NattabletesterPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-

-/**

- * <!-- 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();

-

-		// 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);

-

-		// Create package meta-data objects

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-

-		// 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

-	 */

-	public EClass getTable() {

-		return tableEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_Context() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_TableConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTable_InvertAxis() {

-		return (EAttribute)tableEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_ColumnAxisProvidersHistory() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_RowAxisProvidersHistory() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_LocalRowHeaderAxisConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_LocalColumnHeaderAxisConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_CurrentRowAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_CurrentColumnAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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__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);

-	}

-

-	/**

-	 * <!-- 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);

-		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);

-

-		// 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, 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(), theEcorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		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$

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} //NattablePackageImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
deleted file mode 100644
index dc3c22708f5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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:

- * <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#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>

- * </ul>

- * </p>

- *

- * @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 #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;

-

-	/**

-	 * <!-- 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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	public boolean isInvertAxis() {

-		return invertAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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 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);

-		}

-		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__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();

-		}

-		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__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;

-		}

-		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__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;

-		}

-		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__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;

-		}

-		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(')');

-		return result.toString();

-	}

-

-} //TableImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
deleted file mode 100644
index f3f0b271322..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis()

- * @model

- * @generated

- */

-public interface EObjectAxis extends ObjectAxis {

-	/**

-	 * 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(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
deleted file mode 100644
index 66388681861..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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 -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis()

- * @model

- * @generated

- */

-public interface EStructuralFeatureAxis extends FeatureAxis {

-	/**

-	 * 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(EStructuralFeature)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
deleted file mode 100644
index 6c86dab3b87..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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 -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis()

- * @model abstract="true"

- * @generated

- */

-public interface FeatureAxis extends IAxis {

-	/**

-	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Local Label 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>Local Label Configuration</em>' reference.

-	 * @see #setLocalLabelConfiguration(FeatureLabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis_LocalLabelConfiguration()

-	 * @model

-	 * @generated

-	 */

-	FeatureLabelProviderConfiguration getLocalLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Label Configuration</em>' reference.

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalLabelConfiguration(FeatureLabelProviderConfiguration value);

-

-} // FeatureAxis

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
deleted file mode 100644
index ac7d42c5b79..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdAxis()

- * @model

- * @generated

- */

-public interface FeatureIdAxis extends IdAxis, FeatureAxis {

-} // FeatureIdAxis

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
deleted file mode 100644
index d25f8f46294..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IAxis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IAxis extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Manager</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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 required="true"

-	 * @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 -->

-	 * <p>

-	 * If the meaning of the '<em>Alias</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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 -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getElement();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getLocalLabelConfiguration();

-

-} // IAxis

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
deleted file mode 100644
index 758c144ffe9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis()

- * @model abstract="true"

- * @generated

- */

-public interface IdAxis extends IAxis {

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
deleted file mode 100644
index 372f5341380..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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>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>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>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>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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
deleted file mode 100644
index 0c2086bfec3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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;

-

-/**

- * <!-- 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>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__MANAGER = 0;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__ALIAS = 1;

-

-	/**

-	 * The number of structural features of the '<em>IAxis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS_FEATURE_COUNT = 2;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_ELEMENT = 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 = 1;

-

-	/**

-	 * The number of operations of the '<em>IAxis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS_OPERATION_COUNT = 2;

-

-	/**

-	 * 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 = 1;

-

-	/**

-	 * 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 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.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 = 4;

-

-	/**

-	 * 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>' 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 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 = 2;

-

-	/**

-	 * 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>' 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 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.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 = 3;

-

-	/**

-	 * 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>' 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 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.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 = 5;

-

-	/**

-	 * 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>' 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 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.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 = 6;

-

-	/**

-	 * 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>' 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 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.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 = 7;

-

-	/**

-	 * 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>' 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 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;

-

-

-	/**

-	 * 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.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.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.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 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 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.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 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 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.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.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.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 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.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.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.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>' 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.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>' 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.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.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.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();

-

-	}

-

-} //NattableaxisPackage

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
deleted file mode 100644
index cca6bad1efa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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 -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis()

- * @model abstract="true"

- * @generated

- */

-public interface ObjectAxis extends IAxis {

-	/**

-	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Local Label 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>Local Label Configuration</em>' reference.

-	 * @see #setLocalLabelConfiguration(ObjectLabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis_LocalLabelConfiguration()

-	 * @model

-	 * @generated

-	 */

-	ObjectLabelProviderConfiguration getLocalLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Label Configuration</em>' reference.

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalLabelConfiguration(ObjectLabelProviderConfiguration value);

-

-} // ObjectAxis

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
deleted file mode 100644
index 0a53dfc7e31..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdAxis()

- * @model

- * @generated

- */

-public interface ObjectIdAxis extends IdAxis, ObjectAxis {

-} // ObjectIdAxis

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
deleted file mode 100644
index c98ee0b33b2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- * </p>

- *

- * @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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
deleted file mode 100644
index 02d42bc9f8c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- * </p>

- *

- * @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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
deleted file mode 100644
index 118d89425a9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.emf.ecore.impl.MinimalEObjectImpl;

-

-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;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <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>

- * </p>

- *

- * @generated

- */

-public abstract class FeatureAxisImpl extends MinimalEObjectImpl.Container 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>}' 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

-	 */

-	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

-	 */

-	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

-	 */

-	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.FEATURE_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {

-		if (localLabelConfiguration != null && localLabelConfiguration.eIsProxy()) {

-			InternalEObject oldLocalLabelConfiguration = (InternalEObject)localLabelConfiguration;

-			localLabelConfiguration = (FeatureLabelProviderConfiguration)eResolveProxy(oldLocalLabelConfiguration);

-			if (localLabelConfiguration != oldLocalLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-			}

-		}

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureLabelProviderConfiguration basicGetLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-	}

-

-	/**

-	 * <!-- 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 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:

-				if (resolve) return getLocalLabelConfiguration();

-				return basicGetLocalLabelConfiguration();

-		}

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
deleted file mode 100644
index 83e7645cb06..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {

-	/**

-	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' 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

-	 */

-	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {

-		if (localLabelConfiguration != null && localLabelConfiguration.eIsProxy()) {

-			InternalEObject oldLocalLabelConfiguration = (InternalEObject)localLabelConfiguration;

-			localLabelConfiguration = (FeatureLabelProviderConfiguration)eResolveProxy(oldLocalLabelConfiguration);

-			if (localLabelConfiguration != oldLocalLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-			}

-		}

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureLabelProviderConfiguration basicGetLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-	}

-

-	/**

-	 * <!-- 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:

-				if (resolve) return getLocalLabelConfiguration();

-				return basicGetLocalLabelConfiguration();

-		}

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
deleted file mode 100644
index 0dca2add467..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.emf.ecore.impl.MinimalEObjectImpl;

-

-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;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <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>

- * </p>

- *

- * @generated

- */

-public abstract class IdAxisImpl extends MinimalEObjectImpl.Container 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

-	 */

-	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

-	 */

-	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

-	 */

-	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.ID_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
deleted file mode 100644
index 3d95d4d2468..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.EOBJECT_AXIS: return createEObjectAxis();

-			case NattableaxisPackage.FEATURE_ID_AXIS: return createFeatureIdAxis();

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: return createEStructuralFeatureAxis();

-			case NattableaxisPackage.OBJECT_ID_AXIS: return createObjectIdAxis();

-			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

-	 */

-	public EObjectAxis createEObjectAxis() {

-		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();

-		return eObjectAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureIdAxis createFeatureIdAxis() {

-		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();

-		return featureIdAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeatureAxis createEStructuralFeatureAxis() {

-		EStructuralFeatureAxisImpl eStructuralFeatureAxis = new EStructuralFeatureAxisImpl();

-		return eStructuralFeatureAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectIdAxis createObjectIdAxis() {

-		ObjectIdAxisImpl objectIdAxis = new ObjectIdAxisImpl();

-		return objectIdAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
deleted file mode 100644
index a5e5fc64179..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.nattable.model.nattable.NattablePackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-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.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-

-/**

- * <!-- 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 idAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureIdAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eStructuralFeatureAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectIdAxisEClass = 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();

-

-		// 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);

-

-		// Create package meta-data objects

-		theNattableaxisPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableaxisPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.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

-	 */

-	public EClass getIAxis() {

-		return iAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getIAxis_Manager() {

-		return (EReference)iAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getIAxis_Alias() {

-		return (EAttribute)iAxisEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation getIAxis__GetElement() {

-		return iAxisEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation getIAxis__GetLocalLabelConfiguration() {

-		return iAxisEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getIdAxis() {

-		return idAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getIdAxis_Element() {

-		return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getEObjectAxis() {

-		return eObjectAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getEObjectAxis_Element() {

-		return (EReference)eObjectAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getFeatureAxis() {

-		return featureAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getFeatureAxis_LocalLabelConfiguration() {

-		return (EReference)featureAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getObjectAxis() {

-		return objectAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getObjectAxis_LocalLabelConfiguration() {

-		return (EReference)objectAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getFeatureIdAxis() {

-		return featureIdAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getEStructuralFeatureAxis() {

-		return eStructuralFeatureAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getEStructuralFeatureAxis_Element() {

-		return (EReference)eStructuralFeatureAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getObjectIdAxis() {

-		return objectIdAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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);

-

-		idAxisEClass = createEClass(ID_AXIS);

-		createEAttribute(idAxisEClass, ID_AXIS__ELEMENT);

-

-		eObjectAxisEClass = createEClass(EOBJECT_AXIS);

-		createEReference(eObjectAxisEClass, EOBJECT_AXIS__ELEMENT);

-

-		featureAxisEClass = createEClass(FEATURE_AXIS);

-		createEReference(featureAxisEClass, FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);

-

-		objectAxisEClass = createEClass(OBJECT_AXIS);

-		createEReference(objectAxisEClass, OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);

-

-		featureIdAxisEClass = createEClass(FEATURE_ID_AXIS);

-

-		eStructuralFeatureAxisEClass = createEClass(ESTRUCTURAL_FEATURE_AXIS);

-		createEReference(eStructuralFeatureAxisEClass, ESTRUCTURAL_FEATURE_AXIS__ELEMENT);

-

-		objectIdAxisEClass = createEClass(OBJECT_ID_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

-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		idAxisEClass.getESuperTypes().add(this.getIAxis());

-		eObjectAxisEClass.getESuperTypes().add(this.getObjectAxis());

-		featureAxisEClass.getESuperTypes().add(this.getIAxis());

-		objectAxisEClass.getESuperTypes().add(this.getIAxis());

-		featureIdAxisEClass.getESuperTypes().add(this.getIdAxis());

-		featureIdAxisEClass.getESuperTypes().add(this.getFeatureAxis());

-		eStructuralFeatureAxisEClass.getESuperTypes().add(this.getFeatureAxis());

-		objectIdAxisEClass.getESuperTypes().add(this.getIdAxis());

-		objectIdAxisEClass.getESuperTypes().add(this.getObjectAxis());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(iAxisEClass, IAxis.class, "IAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getIAxis_Manager(), theNattableaxisconfigurationPackage.getAxisManagerRepresentation(), null, "manager", null, 1, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getIAxis_Alias(), theEcorePackage.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(idAxisEClass, IdAxis.class, "IdAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getIdAxis_Element(), ecorePackage.getEString(), "element", null, 1, 1, IdAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(eObjectAxisEClass, EObjectAxis.class, "EObjectAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEObjectAxis_Element(), theEcorePackage.getEObject(), null, "element", null, 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(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(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(featureIdAxisEClass, FeatureIdAxis.class, "FeatureIdAxis", !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(), theEcorePackage.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(objectIdAxisEClass, ObjectIdAxis.class, "ObjectIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-	}

-

-} //NattableaxisPackageImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
deleted file mode 100644
index 3f3395ac054..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.emf.ecore.impl.MinimalEObjectImpl;

-

-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;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <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>

- * </p>

- *

- * @generated

- */

-public abstract class ObjectAxisImpl extends MinimalEObjectImpl.Container 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>}' 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

-	 */

-	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

-	 */

-	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

-	 */

-	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.OBJECT_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {

-		if (localLabelConfiguration != null && localLabelConfiguration.eIsProxy()) {

-			InternalEObject oldLocalLabelConfiguration = (InternalEObject)localLabelConfiguration;

-			localLabelConfiguration = (ObjectLabelProviderConfiguration)eResolveProxy(oldLocalLabelConfiguration);

-			if (localLabelConfiguration != oldLocalLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-			}

-		}

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectLabelProviderConfiguration basicGetLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-	}

-

-	/**

-	 * <!-- 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 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:

-				if (resolve) return getLocalLabelConfiguration();

-				return basicGetLocalLabelConfiguration();

-		}

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
deleted file mode 100644
index beaabaff6b0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {

-	/**

-	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' 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

-	 */

-	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {

-		if (localLabelConfiguration != null && localLabelConfiguration.eIsProxy()) {

-			InternalEObject oldLocalLabelConfiguration = (InternalEObject)localLabelConfiguration;

-			localLabelConfiguration = (ObjectLabelProviderConfiguration)eResolveProxy(oldLocalLabelConfiguration);

-			if (localLabelConfiguration != oldLocalLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-			}

-		}

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectLabelProviderConfiguration basicGetLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, localLabelConfiguration));

-	}

-

-	/**

-	 * <!-- 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:

-				if (resolve) return getLocalLabelConfiguration();

-				return basicGetLocalLabelConfiguration();

-		}

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
deleted file mode 100644
index c47e25442a7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.EObject;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

-

-/**

- * <!-- 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 caseIdAxis(IdAxis object) {

-				return createIdAxisAdapter();

-			}

-			@Override

-			public Adapter caseEObjectAxis(EObjectAxis object) {

-				return createEObjectAxisAdapter();

-			}

-			@Override

-			public Adapter caseFeatureAxis(FeatureAxis object) {

-				return createFeatureAxisAdapter();

-			}

-			@Override

-			public Adapter caseObjectAxis(ObjectAxis object) {

-				return createObjectAxisAdapter();

-			}

-			@Override

-			public Adapter caseFeatureIdAxis(FeatureIdAxis object) {

-				return createFeatureIdAxisAdapter();

-			}

-			@Override

-			public Adapter caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {

-				return createEStructuralFeatureAxisAdapter();

-			}

-			@Override

-			public Adapter caseObjectIdAxis(ObjectIdAxis object) {

-				return createObjectIdAxisAdapter();

-			}

-			@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.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.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.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.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.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.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.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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
deleted file mode 100644
index 38bdb779718..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util;

-

-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.*;

-

-/**

- * <!-- 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 -->

-	 * @parameter 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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>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>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>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>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>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>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>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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
deleted file mode 100644
index 2da25008eb9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractHeaderAxisConfiguration extends EModelElement {

-	/**

-	 * 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 -->

-	 * <p>

-	 * If the meaning of the '<em>Index 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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Display Label</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 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 -->

-	 * <p>

-	 * If the meaning of the '<em>Display Filter</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 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 -->

-	 * <p>

-	 * If the meaning of the '<em>Display Index</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 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 -->

-	 * <p>

-	 * If the meaning of the '<em>Owned Label Configurations</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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Owned Axis Configurations</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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
deleted file mode 100644
index a39f77737f8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Axis Index Style</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-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 -->

-	 * <p>

-	 * If the meaning of '<em><b>ALPHABETIC</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #ALPHABETIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ALPHABETIC_VALUE = 1;

-

-	/**

-	 * The '<em><b>NUMERIC</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>NUMERIC</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #NUMERIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int NUMERIC_VALUE = 0;

-

-	/**

-	 * 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 -->

-	 * @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 -->

-	 * @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 -->

-	 * @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

-	 */

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-	

-} //AxisIndexStyle

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
deleted file mode 100644
index d785bc975ac..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Manager Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration()

- * @model

- * @generated

- */

-public interface AxisManagerConfiguration extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Local Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Local Header Label 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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Axis Manager</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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 -->

-	 * <p>

-	 * If the meaning of the '<em>Local Specific Configurations</em>' reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Local Specific 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
deleted file mode 100644
index 6009706f106..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Manager Representation</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation()

- * @model

- * @generated

- */

-public interface AxisManagerRepresentation extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Axis Manager Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Axis Manager 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>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 -->

-	 * <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#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 -->

-	 * <p>

-	 * If the meaning of the '<em>Header Label 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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Specific Axis Configurations</em>' reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Specific Axis 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
deleted file mode 100644
index 75deb4526a9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import 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 -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration()

- * @model

- * @generated

- */

-public interface EStructuralFeatureValueFillingConfiguration extends IFillingConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Listen Feature</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Listen Feature</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
deleted file mode 100644
index a3c7ba8fc7b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration()

- * @model

- * @generated

- */

-public interface FeatureAxisConfiguration extends IAxisConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Show Only Common Feature</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Show Only Common Feature</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
deleted file mode 100644
index 9c69d5e27a7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IAxis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIAxisConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IAxisConfiguration extends EObject {

-} // IAxisConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
deleted file mode 100644
index 2e624e46b2d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IFilling Configuration</b></em>'.

- * <!-- end-user-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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
deleted file mode 100644
index 538868dacd7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IPaste Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration()

- * @model

- * @generated

- */

-public interface IPasteConfiguration extends IAxisConfiguration {

-} // IPasteConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
deleted file mode 100644
index 09693a3183c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import 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 -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration()

- * @model

- * @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 -->

-	 * <p>

-	 * If the meaning of the '<em>Axis Manager Configurations</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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
deleted file mode 100644
index 85b65ed5ebb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import 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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
deleted file mode 100644
index 3df3187fe0c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
+++ /dev/null
@@ -1,1349 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import 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.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.nattableaxisconfiguration.NattableaxisconfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface NattableaxisconfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableaxisconfiguration"; //$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/nattableaxisconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableaxisconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl <em>Abstract Header Axis Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAbstractHeaderAxisConfiguration()

-	 * @generated

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Index Style</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Display Filter</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Display Index</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Owned Label Configurations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;

-

-	/**

-	 * The number of structural features of the '<em>Abstract Header Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 6;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Abstract Header Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl <em>Axis Manager Representation</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerRepresentation()

-	 * @generated

-	 */

-	int AXIS_MANAGER_REPRESENTATION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Axis Manager Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID = 0;

-

-	/**

-	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT = 1;

-

-	/**

-	 * The feature id for the '<em><b>Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Specific Axis Configurations</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS = 3;

-

-	/**

-	 * The number of structural features of the '<em>Axis Manager Representation</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_REPRESENTATION_FEATURE_COUNT = 4;

-

-	/**

-	 * The number of operations of the '<em>Axis Manager Representation</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_REPRESENTATION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl <em>Axis Manager Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerConfiguration()

-	 * @generated

-	 */

-	int AXIS_MANAGER_CONFIGURATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Local Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Axis Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER = 1;

-

-	/**

-	 * The feature id for the '<em><b>Local Specific Configurations</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS = 2;

-

-	/**

-	 * The number of structural features of the '<em>Axis Manager Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_CONFIGURATION_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>Axis Manager Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_MANAGER_CONFIGURATION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl <em>Table Header Axis Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getTableHeaderAxisConfiguration()

-	 * @generated

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__EANNOTATIONS = ABSTRACT_HEADER_AXIS_CONFIGURATION__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Index Style</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__INDEX_STYLE = ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL = ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL;

-

-	/**

-	 * The feature id for the '<em><b>Display Filter</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER = ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER;

-

-	/**

-	 * The feature id for the '<em><b>Display Index</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX = ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX;

-

-	/**

-	 * The feature id for the '<em><b>Owned Label Configurations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS = ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS = ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Axis Managers</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS = ABSTRACT_HEADER_AXIS_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Table Header Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION_FEATURE_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION___GET_EANNOTATION__STRING = ABSTRACT_HEADER_AXIS_CONFIGURATION___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Table Header Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl <em>Local Table Header Axis Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getLocalTableHeaderAxisConfiguration()

-	 * @generated

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION = 4;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__EANNOTATIONS = ABSTRACT_HEADER_AXIS_CONFIGURATION__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Index Style</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__INDEX_STYLE = ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL = ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL;

-

-	/**

-	 * The feature id for the '<em><b>Display Filter</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER = ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER;

-

-	/**

-	 * The feature id for the '<em><b>Display Index</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX = ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX;

-

-	/**

-	 * The feature id for the '<em><b>Owned Label Configurations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS = ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS = ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Axis Manager Configurations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS = ABSTRACT_HEADER_AXIS_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Local Table Header Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION_FEATURE_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION___GET_EANNOTATION__STRING = ABSTRACT_HEADER_AXIS_CONFIGURATION___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Local Table Header Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIAxisConfiguration()

-	 * @generated

-	 */

-	int IAXIS_CONFIGURATION = 5;

-

-	/**

-	 * The number of structural features of the '<em>IAxis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS_CONFIGURATION_FEATURE_COUNT = 0;

-

-	/**

-	 * The number of operations of the '<em>IAxis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS_CONFIGURATION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl <em>Feature Axis Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getFeatureAxisConfiguration()

-	 * @generated

-	 */

-	int FEATURE_AXIS_CONFIGURATION = 6;

-

-	/**

-	 * The feature id for the '<em><b>Show Only Common Feature</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE = IAXIS_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Feature Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS_CONFIGURATION_FEATURE_COUNT = IAXIS_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Feature Axis Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIFillingConfiguration()

-	 * @generated

-	 */

-	int IFILLING_CONFIGURATION = 7;

-

-	/**

-	 * The number of structural features of the '<em>IFilling Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IFILLING_CONFIGURATION_FEATURE_COUNT = IAXIS_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>IFilling Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IFILLING_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl <em>EStructural Feature Value Filling Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getEStructuralFeatureValueFillingConfiguration()

-	 * @generated

-	 */

-	int ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION = 8;

-

-	/**

-	 * The feature id for the '<em><b>Listen Feature</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE = IFILLING_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EStructural Feature Value Filling Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION_FEATURE_COUNT = IFILLING_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>EStructural Feature Value Filling Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION_OPERATION_COUNT = IFILLING_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl <em>IPaste Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIPasteConfiguration()

-	 * @generated

-	 */

-	int IPASTE_CONFIGURATION = 9;

-

-	/**

-	 * The number of structural features of the '<em>IPaste Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IPASTE_CONFIGURATION_FEATURE_COUNT = IAXIS_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>IPaste Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IPASTE_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl <em>Paste EObject Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getPasteEObjectConfiguration()

-	 * @generated

-	 */

-	int PASTE_EOBJECT_CONFIGURATION = 10;

-

-	/**

-	 * The feature id for the '<em><b>Pasted Element Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID = IPASTE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Paste Element Containement Feature</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE = IPASTE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Paste EObject Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_EOBJECT_CONFIGURATION_FEATURE_COUNT = IPASTE_CONFIGURATION_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of operations of the '<em>Paste EObject Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_EOBJECT_CONFIGURATION_OPERATION_COUNT = IPASTE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisIndexStyle()

-	 * @generated

-	 */

-	int AXIS_INDEX_STYLE = 11;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration <em>Abstract Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Abstract Header Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration

-	 * @generated

-	 */

-	EClass getAbstractHeaderAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Index Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle()

-	 * @see #getAbstractHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EAttribute getAbstractHeaderAxisConfiguration_IndexStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Label</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel()

-	 * @see #getAbstractHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EAttribute getAbstractHeaderAxisConfiguration_DisplayLabel();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Filter</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter()

-	 * @see #getAbstractHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EAttribute getAbstractHeaderAxisConfiguration_DisplayFilter();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Index</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex()

-	 * @see #getAbstractHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EAttribute getAbstractHeaderAxisConfiguration_DisplayIndex();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Owned Label Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations()

-	 * @see #getAbstractHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EReference getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Owned Axis Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations()

-	 * @see #getAbstractHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EReference getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation <em>Axis Manager Representation</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Axis Manager Representation</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation

-	 * @generated

-	 */

-	EClass getAxisManagerRepresentation();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Axis Manager Id</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId()

-	 * @see #getAxisManagerRepresentation()

-	 * @generated

-	 */

-	EAttribute getAxisManagerRepresentation_AxisManagerId();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Label Provider Context</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext()

-	 * @see #getAxisManagerRepresentation()

-	 * @generated

-	 */

-	EAttribute getAxisManagerRepresentation_LabelProviderContext();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Header Label Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration()

-	 * @see #getAxisManagerRepresentation()

-	 * @generated

-	 */

-	EReference getAxisManagerRepresentation_HeaderLabelConfiguration();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference list '<em>Specific Axis Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations()

-	 * @see #getAxisManagerRepresentation()

-	 * @generated

-	 */

-	EReference getAxisManagerRepresentation_SpecificAxisConfigurations();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Axis Manager Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration

-	 * @generated

-	 */

-	EClass getAxisManagerConfiguration();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Local Header Label Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration()

-	 * @see #getAxisManagerConfiguration()

-	 * @generated

-	 */

-	EReference getAxisManagerConfiguration_LocalHeaderLabelConfiguration();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Axis Manager</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager()

-	 * @see #getAxisManagerConfiguration()

-	 * @generated

-	 */

-	EReference getAxisManagerConfiguration_AxisManager();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference list '<em>Local Specific Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations()

-	 * @see #getAxisManagerConfiguration()

-	 * @generated

-	 */

-	EReference getAxisManagerConfiguration_LocalSpecificConfigurations();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table Header Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration

-	 * @generated

-	 */

-	EClass getTableHeaderAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Axis Managers</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers()

-	 * @see #getTableHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EReference getTableHeaderAxisConfiguration_AxisManagers();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration <em>Local Table Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Local Table Header Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration

-	 * @generated

-	 */

-	EClass getLocalTableHeaderAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Axis Manager Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations()

-	 * @see #getLocalTableHeaderAxisConfiguration()

-	 * @generated

-	 */

-	EReference getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>IAxis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

-	 * @generated

-	 */

-	EClass getIAxisConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration <em>Feature Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Feature Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration

-	 * @generated

-	 */

-	EClass getFeatureAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Show Only Common Feature</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature()

-	 * @see #getFeatureAxisConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureAxisConfiguration_ShowOnlyCommonFeature();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>IFilling Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

-	 * @generated

-	 */

-	EClass getIFillingConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration <em>EStructural Feature Value Filling Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EStructural Feature Value Filling Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration

-	 * @generated

-	 */

-	EClass getEStructuralFeatureValueFillingConfiguration();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Listen Feature</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature()

-	 * @see #getEStructuralFeatureValueFillingConfiguration()

-	 * @generated

-	 */

-	EReference getEStructuralFeatureValueFillingConfiguration_ListenFeature();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>IPaste Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration

-	 * @generated

-	 */

-	EClass getIPasteConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration <em>Paste EObject Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Paste EObject Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration

-	 * @generated

-	 */

-	EClass getPasteEObjectConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Pasted Element Id</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId()

-	 * @see #getPasteEObjectConfiguration()

-	 * @generated

-	 */

-	EAttribute getPasteEObjectConfiguration_PastedElementId();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Paste Element Containement Feature</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature()

-	 * @see #getPasteEObjectConfiguration()

-	 * @generated

-	 */

-	EReference getPasteEObjectConfiguration_PasteElementContainementFeature();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for enum '<em>Axis Index Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * @generated

-	 */

-	EEnum getAxisIndexStyle();

-

-	/**

-	 * 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

-	 */

-	NattableaxisconfigurationFactory getNattableaxisconfigurationFactory();

-

-	/**

-	 * <!-- 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.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl <em>Abstract Header Axis Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAbstractHeaderAxisConfiguration()

-		 * @generated

-		 */

-		EClass ABSTRACT_HEADER_AXIS_CONFIGURATION = eINSTANCE.getAbstractHeaderAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Index Style</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE = eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Filter</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER = eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Index</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX = eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();

-

-		/**

-		 * The meta object literal for the '<em><b>Owned Label Configurations</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS = eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations();

-

-		/**

-		 * The meta object literal for the '<em><b>Owned Axis Configurations</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS = eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl <em>Axis Manager Representation</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerRepresentation()

-		 * @generated

-		 */

-		EClass AXIS_MANAGER_REPRESENTATION = eINSTANCE.getAxisManagerRepresentation();

-

-		/**

-		 * The meta object literal for the '<em><b>Axis Manager Id</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID = eINSTANCE.getAxisManagerRepresentation_AxisManagerId();

-

-		/**

-		 * The meta object literal for the '<em><b>Label Provider Context</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT = eINSTANCE.getAxisManagerRepresentation_LabelProviderContext();

-

-		/**

-		 * The meta object literal for the '<em><b>Header Label Configuration</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION = eINSTANCE.getAxisManagerRepresentation_HeaderLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Specific Axis Configurations</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS = eINSTANCE.getAxisManagerRepresentation_SpecificAxisConfigurations();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl <em>Axis Manager Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerConfiguration()

-		 * @generated

-		 */

-		EClass AXIS_MANAGER_CONFIGURATION = eINSTANCE.getAxisManagerConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Header Label Configuration</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION = eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Axis Manager</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER = eINSTANCE.getAxisManagerConfiguration_AxisManager();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Specific Configurations</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS = eINSTANCE.getAxisManagerConfiguration_LocalSpecificConfigurations();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl <em>Table Header Axis Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getTableHeaderAxisConfiguration()

-		 * @generated

-		 */

-		EClass TABLE_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTableHeaderAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Axis Managers</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS = eINSTANCE.getTableHeaderAxisConfiguration_AxisManagers();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl <em>Local Table Header Axis Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getLocalTableHeaderAxisConfiguration()

-		 * @generated

-		 */

-		EClass LOCAL_TABLE_HEADER_AXIS_CONFIGURATION = eINSTANCE.getLocalTableHeaderAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Axis Manager Configurations</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS = eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIAxisConfiguration()

-		 * @generated

-		 */

-		EClass IAXIS_CONFIGURATION = eINSTANCE.getIAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl <em>Feature Axis Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getFeatureAxisConfiguration()

-		 * @generated

-		 */

-		EClass FEATURE_AXIS_CONFIGURATION = eINSTANCE.getFeatureAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Show Only Common Feature</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE = eINSTANCE.getFeatureAxisConfiguration_ShowOnlyCommonFeature();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIFillingConfiguration()

-		 * @generated

-		 */

-		EClass IFILLING_CONFIGURATION = eINSTANCE.getIFillingConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl <em>EStructural Feature Value Filling Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getEStructuralFeatureValueFillingConfiguration()

-		 * @generated

-		 */

-		EClass ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION = eINSTANCE.getEStructuralFeatureValueFillingConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Listen Feature</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE = eINSTANCE.getEStructuralFeatureValueFillingConfiguration_ListenFeature();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl <em>IPaste Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIPasteConfiguration()

-		 * @generated

-		 */

-		EClass IPASTE_CONFIGURATION = eINSTANCE.getIPasteConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl <em>Paste EObject Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getPasteEObjectConfiguration()

-		 * @generated

-		 */

-		EClass PASTE_EOBJECT_CONFIGURATION = eINSTANCE.getPasteEObjectConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Pasted Element Id</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID = eINSTANCE.getPasteEObjectConfiguration_PastedElementId();

-

-		/**

-		 * The meta object literal for the '<em><b>Paste Element Containement Feature</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE = eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisIndexStyle()

-		 * @generated

-		 */

-		EEnum AXIS_INDEX_STYLE = eINSTANCE.getAxisIndexStyle();

-

-	}

-

-} //NattableaxisconfigurationPackage

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
deleted file mode 100644
index 00c36839542..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Paste EObject Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration()

- * @model

- * @generated

- */

-public interface PasteEObjectConfiguration extends IPasteConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Pasted Element Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Pasted Element 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>Pasted Element Id</em>' attribute.

-	 * @see #setPastedElementId(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration_PastedElementId()

-	 * @model

-	 * @generated

-	 */

-	String getPastedElementId();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Pasted Element Id</em>' attribute.

-	 * @see #getPastedElementId()

-	 * @generated

-	 */

-	void setPastedElementId(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Paste Element Containement Feature</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Paste Element Containement Feature</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 Element Containement Feature</em>' reference.

-	 * @see #setPasteElementContainementFeature(EStructuralFeature)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration_PasteElementContainementFeature()

-	 * @model

-	 * @generated

-	 */

-	EStructuralFeature getPasteElementContainementFeature();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Paste Element Containement Feature</em>' reference.

-	 * @see #getPasteElementContainementFeature()

-	 * @generated

-	 */

-	void setPasteElementContainementFeature(EStructuralFeature value);

-

-} // PasteEObjectConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
deleted file mode 100644
index e779c72d809..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import 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 -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration()

- * @model

- * @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 -->

-	 * <p>

-	 * If the meaning of the '<em>Axis Managers</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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
deleted file mode 100644
index 1c11a036aa3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.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;

-

-/**

- * <!-- 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:

- * <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>

- * </p>

- *

- * @generated

- */

-public abstract class AbstractHeaderAxisConfigurationImpl extends EModelElementImpl 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

-	 */

-	public AxisIndexStyle getIndexStyle() {

-		return indexStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public boolean isDisplayLabel() {

-		return displayLabel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public boolean isDisplayFilter() {

-		return displayFilter;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public boolean isDisplayIndex() {

-		return displayIndex;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
deleted file mode 100644
index 2b684d69b15..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.impl.MinimalEObjectImpl;

-

-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;

-

-/**

- * <!-- 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:

- * <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>

- * </p>

- *

- * @generated

- */

-public class AxisManagerConfigurationImpl extends MinimalEObjectImpl.Container 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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
deleted file mode 100644
index 0ff932309ae..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.impl.MinimalEObjectImpl;

-

-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;

-

-/**

- * <!-- 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:

- * <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>

- * </p>

- *

- * @generated

- */

-public class AxisManagerRepresentationImpl extends MinimalEObjectImpl.Container 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

-	 */

-	public String getAxisManagerId() {

-		return axisManagerId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public String getLabelProviderContext() {

-		return labelProviderContext;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
deleted file mode 100644
index 5d5be01aac3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * <!-- 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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl#getListenFeature <em>Listen Feature</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class EStructuralFeatureValueFillingConfigurationImpl extends MinimalEObjectImpl.Container 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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
deleted file mode 100644
index 63ce8cdd39a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * <!-- 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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FeatureAxisConfigurationImpl extends MinimalEObjectImpl.Container 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

-	 */

-	public boolean isShowOnlyCommonFeature() {

-		return showOnlyCommonFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
deleted file mode 100644
index 3d7d951a02b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>IPaste Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class IPasteConfigurationImpl extends MinimalEObjectImpl.Container implements IPasteConfiguration {

-	/**

-	 * <!-- 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;

-	}

-

-} //IPasteConfigurationImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
deleted file mode 100644
index 6f31393855a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>

- * </ul>

- * </p>

- *

- * @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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
deleted file mode 100644
index 711b5a68ed1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.*;

-

-/**

- * <!-- 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();

-			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

-	 */

-	public AxisManagerRepresentation createAxisManagerRepresentation() {

-		AxisManagerRepresentationImpl axisManagerRepresentation = new AxisManagerRepresentationImpl();

-		return axisManagerRepresentation;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerConfiguration createAxisManagerConfiguration() {

-		AxisManagerConfigurationImpl axisManagerConfiguration = new AxisManagerConfigurationImpl();

-		return axisManagerConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableHeaderAxisConfiguration createTableHeaderAxisConfiguration() {

-		TableHeaderAxisConfigurationImpl tableHeaderAxisConfiguration = new TableHeaderAxisConfigurationImpl();

-		return tableHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration() {

-		LocalTableHeaderAxisConfigurationImpl localTableHeaderAxisConfiguration = new LocalTableHeaderAxisConfigurationImpl();

-		return localTableHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureAxisConfiguration createFeatureAxisConfiguration() {

-		FeatureAxisConfigurationImpl featureAxisConfiguration = new FeatureAxisConfigurationImpl();

-		return featureAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration() {

-		EStructuralFeatureValueFillingConfigurationImpl eStructuralFeatureValueFillingConfiguration = new EStructuralFeatureValueFillingConfigurationImpl();

-		return eStructuralFeatureValueFillingConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPasteConfiguration createIPasteConfiguration() {

-		IPasteConfigurationImpl iPasteConfiguration = new IPasteConfigurationImpl();

-		return iPasteConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public PasteEObjectConfiguration createPasteEObjectConfiguration() {

-		PasteEObjectConfigurationImpl pasteEObjectConfiguration = new PasteEObjectConfigurationImpl();

-		return pasteEObjectConfiguration;

-	}

-

-	/**

-	 * <!-- 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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
deleted file mode 100644
index 238e5f50e99..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.EcorePackage;

-

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-

-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.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.nattableaxisprovider.NattableaxisproviderPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationPackageImpl extends EPackageImpl implements NattableaxisconfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass abstractHeaderAxisConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass axisManagerRepresentationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass axisManagerConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableHeaderAxisConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass localTableHeaderAxisConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iAxisConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureAxisConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iFillingConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eStructuralFeatureValueFillingConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iPasteConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass pasteEObjectConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EEnum axisIndexStyleEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * 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.nattableaxisconfiguration.NattableaxisconfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableaxisconfigurationPackageImpl() {

-		super(eNS_URI, NattableaxisconfigurationFactory.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 NattableaxisconfigurationPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattableaxisconfigurationPackage init() {

-		if (isInited) return (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisconfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		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);

-		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);

-

-		// Create package meta-data objects

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableaxisconfigurationPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableaxisconfigurationPackage.eNS_URI, theNattableaxisconfigurationPackage);

-		return theNattableaxisconfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getAbstractHeaderAxisConfiguration() {

-		return abstractHeaderAxisConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getAbstractHeaderAxisConfiguration_IndexStyle() {

-		return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getAbstractHeaderAxisConfiguration_DisplayLabel() {

-		return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getAbstractHeaderAxisConfiguration_DisplayFilter() {

-		return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getAbstractHeaderAxisConfiguration_DisplayIndex() {

-		return (EAttribute)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations() {

-		return (EReference)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations() {

-		return (EReference)abstractHeaderAxisConfigurationEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getAxisManagerRepresentation() {

-		return axisManagerRepresentationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getAxisManagerRepresentation_AxisManagerId() {

-		return (EAttribute)axisManagerRepresentationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getAxisManagerRepresentation_LabelProviderContext() {

-		return (EAttribute)axisManagerRepresentationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAxisManagerRepresentation_HeaderLabelConfiguration() {

-		return (EReference)axisManagerRepresentationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAxisManagerRepresentation_SpecificAxisConfigurations() {

-		return (EReference)axisManagerRepresentationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getAxisManagerConfiguration() {

-		return axisManagerConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAxisManagerConfiguration_LocalHeaderLabelConfiguration() {

-		return (EReference)axisManagerConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAxisManagerConfiguration_AxisManager() {

-		return (EReference)axisManagerConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAxisManagerConfiguration_LocalSpecificConfigurations() {

-		return (EReference)axisManagerConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getTableHeaderAxisConfiguration() {

-		return tableHeaderAxisConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableHeaderAxisConfiguration_AxisManagers() {

-		return (EReference)tableHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getLocalTableHeaderAxisConfiguration() {

-		return localTableHeaderAxisConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations() {

-		return (EReference)localTableHeaderAxisConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getIAxisConfiguration() {

-		return iAxisConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getFeatureAxisConfiguration() {

-		return featureAxisConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getFeatureAxisConfiguration_ShowOnlyCommonFeature() {

-		return (EAttribute)featureAxisConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getIFillingConfiguration() {

-		return iFillingConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getEStructuralFeatureValueFillingConfiguration() {

-		return eStructuralFeatureValueFillingConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getEStructuralFeatureValueFillingConfiguration_ListenFeature() {

-		return (EReference)eStructuralFeatureValueFillingConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getIPasteConfiguration() {

-		return iPasteConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getPasteEObjectConfiguration() {

-		return pasteEObjectConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getPasteEObjectConfiguration_PastedElementId() {

-		return (EAttribute)pasteEObjectConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getPasteEObjectConfiguration_PasteElementContainementFeature() {

-		return (EReference)pasteEObjectConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EEnum getAxisIndexStyle() {

-		return axisIndexStyleEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationFactory getNattableaxisconfigurationFactory() {

-		return (NattableaxisconfigurationFactory)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

-		abstractHeaderAxisConfigurationEClass = createEClass(ABSTRACT_HEADER_AXIS_CONFIGURATION);

-		createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE);

-		createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL);

-		createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER);

-		createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX);

-		createEReference(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);

-		createEReference(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);

-

-		axisManagerRepresentationEClass = createEClass(AXIS_MANAGER_REPRESENTATION);

-		createEAttribute(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID);

-		createEAttribute(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT);

-		createEReference(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION);

-		createEReference(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);

-

-		axisManagerConfigurationEClass = createEClass(AXIS_MANAGER_CONFIGURATION);

-		createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION);

-		createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER);

-		createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);

-

-		tableHeaderAxisConfigurationEClass = createEClass(TABLE_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableHeaderAxisConfigurationEClass, TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

-

-		localTableHeaderAxisConfigurationEClass = createEClass(LOCAL_TABLE_HEADER_AXIS_CONFIGURATION);

-		createEReference(localTableHeaderAxisConfigurationEClass, LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);

-

-		iAxisConfigurationEClass = createEClass(IAXIS_CONFIGURATION);

-

-		featureAxisConfigurationEClass = createEClass(FEATURE_AXIS_CONFIGURATION);

-		createEAttribute(featureAxisConfigurationEClass, FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE);

-

-		iFillingConfigurationEClass = createEClass(IFILLING_CONFIGURATION);

-

-		eStructuralFeatureValueFillingConfigurationEClass = createEClass(ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION);

-		createEReference(eStructuralFeatureValueFillingConfigurationEClass, ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE);

-

-		iPasteConfigurationEClass = createEClass(IPASTE_CONFIGURATION);

-

-		pasteEObjectConfigurationEClass = createEClass(PASTE_EOBJECT_CONFIGURATION);

-		createEAttribute(pasteEObjectConfigurationEClass, PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID);

-		createEReference(pasteEObjectConfigurationEClass, PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE);

-

-		// Create enums

-		axisIndexStyleEEnum = createEEnum(AXIS_INDEX_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);

-		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		abstractHeaderAxisConfigurationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		tableHeaderAxisConfigurationEClass.getESuperTypes().add(this.getAbstractHeaderAxisConfiguration());

-		localTableHeaderAxisConfigurationEClass.getESuperTypes().add(this.getAbstractHeaderAxisConfiguration());

-		featureAxisConfigurationEClass.getESuperTypes().add(this.getIAxisConfiguration());

-		iFillingConfigurationEClass.getESuperTypes().add(this.getIAxisConfiguration());

-		eStructuralFeatureValueFillingConfigurationEClass.getESuperTypes().add(this.getIFillingConfiguration());

-		iPasteConfigurationEClass.getESuperTypes().add(this.getIAxisConfiguration());

-		pasteEObjectConfigurationEClass.getESuperTypes().add(this.getIPasteConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(abstractHeaderAxisConfigurationEClass, AbstractHeaderAxisConfiguration.class, "AbstractHeaderAxisConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getAbstractHeaderAxisConfiguration_IndexStyle(), this.getAxisIndexStyle(), "indexStyle", null, 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getAbstractHeaderAxisConfiguration_DisplayLabel(), theEcorePackage.getEBoolean(), "displayLabel", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getAbstractHeaderAxisConfiguration_DisplayFilter(), theEcorePackage.getEBoolean(), "displayFilter", "false", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getAbstractHeaderAxisConfiguration_DisplayIndex(), theEcorePackage.getEBoolean(), "displayIndex", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "ownedLabelConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), this.getIAxisConfiguration(), null, "ownedAxisConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(axisManagerRepresentationEClass, AxisManagerRepresentation.class, "AxisManagerRepresentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getAxisManagerRepresentation_AxisManagerId(), ecorePackage.getEString(), "axisManagerId", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getAxisManagerRepresentation_LabelProviderContext(), theEcorePackage.getEString(), "labelProviderContext", null, 0, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerRepresentation_HeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "headerLabelConfiguration", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerRepresentation_SpecificAxisConfigurations(), this.getIAxisConfiguration(), null, "specificAxisConfigurations", null, 0, -1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(axisManagerConfigurationEClass, AxisManagerConfiguration.class, "AxisManagerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "localHeaderLabelConfiguration", null, 0, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerConfiguration_AxisManager(), this.getAxisManagerRepresentation(), null, "axisManager", null, 1, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerConfiguration_LocalSpecificConfigurations(), this.getIAxisConfiguration(), null, "localSpecificConfigurations", null, 0, -1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(tableHeaderAxisConfigurationEClass, TableHeaderAxisConfiguration.class, "TableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getTableHeaderAxisConfiguration_AxisManagers(), this.getAxisManagerRepresentation(), null, "axisManagers", null, 1, -1, TableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(localTableHeaderAxisConfigurationEClass, LocalTableHeaderAxisConfiguration.class, "LocalTableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), this.getAxisManagerConfiguration(), null, "axisManagerConfigurations", null, 0, -1, LocalTableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iAxisConfigurationEClass, IAxisConfiguration.class, "IAxisConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(featureAxisConfigurationEClass, FeatureAxisConfiguration.class, "FeatureAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getFeatureAxisConfiguration_ShowOnlyCommonFeature(), ecorePackage.getEBoolean(), "showOnlyCommonFeature", null, 0, 1, FeatureAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iFillingConfigurationEClass, IFillingConfiguration.class, "IFillingConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(eStructuralFeatureValueFillingConfigurationEClass, EStructuralFeatureValueFillingConfiguration.class, "EStructuralFeatureValueFillingConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEStructuralFeatureValueFillingConfiguration_ListenFeature(), theEcorePackage.getEStructuralFeature(), null, "listenFeature", null, 1, 1, EStructuralFeatureValueFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iPasteConfigurationEClass, IPasteConfiguration.class, "IPasteConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(pasteEObjectConfigurationEClass, PasteEObjectConfiguration.class, "PasteEObjectConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getPasteEObjectConfiguration_PastedElementId(), ecorePackage.getEString(), "pastedElementId", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getPasteEObjectConfiguration_PasteElementContainementFeature(), theEcorePackage.getEStructuralFeature(), null, "pasteElementContainementFeature", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Initialize enums and add enum literals

-		initEEnum(axisIndexStyleEEnum, AxisIndexStyle.class, "AxisIndexStyle"); //$NON-NLS-1$

-		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.ALPHABETIC);

-		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.NUMERIC);

-	}

-

-} //NattableaxisconfigurationPackageImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
deleted file mode 100644
index aa7b8b3eb2b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Paste EObject Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPastedElementId <em>Pasted Element Id</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl implements PasteEObjectConfiguration {

-	/**

-	 * The default value of the '{@link #getPastedElementId() <em>Pasted Element Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPastedElementId()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PASTED_ELEMENT_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getPastedElementId() <em>Pasted Element Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPastedElementId()

-	 * @generated

-	 * @ordered

-	 */

-	protected String pastedElementId = PASTED_ELEMENT_ID_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getPasteElementContainementFeature() <em>Paste Element Containement Feature</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPasteElementContainementFeature()

-	 * @generated

-	 * @ordered

-	 */

-	protected EStructuralFeature pasteElementContainementFeature;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected PasteEObjectConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getPastedElementId() {

-		return pastedElementId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setPastedElementId(String newPastedElementId) {

-		String oldPastedElementId = pastedElementId;

-		pastedElementId = newPastedElementId;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID, oldPastedElementId, pastedElementId));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeature getPasteElementContainementFeature() {

-		if (pasteElementContainementFeature != null && pasteElementContainementFeature.eIsProxy()) {

-			InternalEObject oldPasteElementContainementFeature = (InternalEObject)pasteElementContainementFeature;

-			pasteElementContainementFeature = (EStructuralFeature)eResolveProxy(oldPasteElementContainementFeature);

-			if (pasteElementContainementFeature != oldPasteElementContainementFeature) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE, oldPasteElementContainementFeature, pasteElementContainementFeature));

-			}

-		}

-		return pasteElementContainementFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeature basicGetPasteElementContainementFeature() {

-		return pasteElementContainementFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setPasteElementContainementFeature(EStructuralFeature newPasteElementContainementFeature) {

-		EStructuralFeature oldPasteElementContainementFeature = pasteElementContainementFeature;

-		pasteElementContainementFeature = newPasteElementContainementFeature;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE, oldPasteElementContainementFeature, pasteElementContainementFeature));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-				return getPastedElementId();

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-				if (resolve) return getPasteElementContainementFeature();

-				return basicGetPasteElementContainementFeature();

-		}

-		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.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-				setPastedElementId((String)newValue);

-				return;

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-				setPasteElementContainementFeature((EStructuralFeature)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-				setPastedElementId(PASTED_ELEMENT_ID_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-				setPasteElementContainementFeature((EStructuralFeature)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-				return PASTED_ELEMENT_ID_EDEFAULT == null ? pastedElementId != null : !PASTED_ELEMENT_ID_EDEFAULT.equals(pastedElementId);

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-				return pasteElementContainementFeature != null;

-		}

-		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(" (pastedElementId: "); //$NON-NLS-1$

-		result.append(pastedElementId);

-		result.append(')');

-		return result.toString();

-	}

-

-} //PasteEObjectConfigurationImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
deleted file mode 100644
index 6afc0797b04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl#getAxisManagers <em>Axis Managers</em>}</li>

- * </ul>

- * </p>

- *

- * @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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
deleted file mode 100644
index 71ed2b839de..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.*;

-

-/**

- * <!-- 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 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.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.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;

-	}

-

-} //NattableaxisconfigurationAdapterFactory

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
deleted file mode 100644
index d57f64417e4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.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.*;

-

-/**

- * <!-- 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 -->

-	 * @parameter 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 = 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 = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: {

-				AxisManagerConfiguration axisManagerConfiguration = (AxisManagerConfiguration)theEObject;

-				T result = caseAxisManagerConfiguration(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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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>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;

-	}

-

-} //NattableaxisconfigurationSwitch

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
deleted file mode 100644
index 936484119ea..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-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 -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractAxisProvider extends EModelElement, TableNamedElement {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	EList<IAxis> getAxis();

-

-} // AbstractAxisProvider

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
deleted file mode 100644
index 4b4ff3a2394..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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 -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider()

- * @model abstract="true"

- * @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 -->

-	 * <p>

-	 * If the meaning of the '<em>Axis</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>Axis</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider_Axis()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<IAxis> getAxis();

-

-} // AxisProvider

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
deleted file mode 100644
index 7129d358b01..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IMaster Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IMasterAxisProvider extends AxisProvider {

-	/**

-	 * Returns the value of the '<em><b>Disconnect Slave</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Disconnect Slave</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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);

-

-} // IMasterAxisProvider

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
deleted file mode 100644
index 62f6a7a2390..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ISlave Axis Provider</b></em>'.

- * <!-- end-user-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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
deleted file mode 100644
index 1f5d3cd04f8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Master Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getMasterObjectAxisProvider()

- * @model

- * @generated

- */

-public interface MasterObjectAxisProvider extends IMasterAxisProvider {

-} // MasterObjectAxisProvider

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
deleted file mode 100644
index 5c51172155a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
deleted file mode 100644
index 48f32e3541f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
+++ /dev/null
@@ -1,774 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.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 = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__DESCRIPTION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * 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 = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * 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 = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_AXIS = EcorePackage.EMODEL_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 = EcorePackage.EMODEL_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>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 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>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 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 + 1;

-

-	/**

-	 * 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 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>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 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>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 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>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 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 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 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 '{@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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
deleted file mode 100644
index 2772462d19b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Slave Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getSlaveObjectAxisProvider()

- * @model

- * @generated

- */

-public interface SlaveObjectAxisProvider extends ISlaveAxisProvider {

-} // SlaveObjectAxisProvider

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
deleted file mode 100644
index 85e136c7ea5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-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.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Abstract Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl#getDescription <em>Description</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl#getName <em>Name</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class AbstractAxisProviderImpl extends EModelElementImpl implements AbstractAxisProvider {

-	/**

-	 * 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 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

-	 */

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setDescription(String newDescription) {

-		String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION, oldDescription, description));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__NAME, oldName, name));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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 eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION:

-				return getDescription();

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__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 NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION:

-				setDescription((String)newValue);

-				return;

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__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 NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION:

-				setDescription(DESCRIPTION_EDEFAULT);

-				return;

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__NAME:

-				setName(NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION:

-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__NAME:

-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == TableNamedElement.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION: return NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-				case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__NAME: return NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-				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 == TableNamedElement.class) {

-			switch (baseFeatureID) {

-				case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION: return NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__DESCRIPTION;

-				case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME: return NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__NAME;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- 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);

-	}

-

-	/**

-	 * <!-- 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();

-	}

-

-} //AbstractAxisProviderImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
deleted file mode 100644
index 8d4bb323203..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl#getAxis <em>Axis</em>}</li>

- * </ul>

- * </p>

- *

- * @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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
deleted file mode 100644
index 1d23a174e8f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.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.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-

-/**

- * <!-- 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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#isDisconnectSlave <em>Disconnect Slave</em>}</li>

- * </ul>

- * </p>

- *

- * @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;

-

-	/**

-	 * <!-- 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

-	 */

-	public boolean isDisconnectSlave() {

-		return disconnectSlave;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				return isDisconnectSlave();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				setDisconnectSlave((Boolean)newValue);

-				return;

-		}

-		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;

-		}

-		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;

-		}

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
deleted file mode 100644
index 42afae5c46f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-/**

- * <!-- 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

-	 */

-	public SlaveObjectAxisProvider createSlaveObjectAxisProvider() {

-		SlaveObjectAxisProviderImpl slaveObjectAxisProvider = new SlaveObjectAxisProviderImpl();

-		return slaveObjectAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public MasterObjectAxisProvider createMasterObjectAxisProvider() {

-		MasterObjectAxisProviderImpl masterObjectAxisProvider = new MasterObjectAxisProviderImpl();

-		return masterObjectAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
deleted file mode 100644
index cbf8bb6883b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.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.nattabletester.NattabletesterPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-

-/**

- * <!-- 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();

-

-		// 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);

-

-		// Create package meta-data objects

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.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

-	 */

-	public EClass getAbstractAxisProvider() {

-		return abstractAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation getAbstractAxisProvider__GetAxis() {

-		return abstractAxisProviderEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getIMasterAxisProvider() {

-		return iMasterAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getIMasterAxisProvider_DisconnectSlave() {

-		return (EAttribute)iMasterAxisProviderEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getISlaveAxisProvider() {

-		return iSlaveAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getAxisProvider() {

-		return axisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getAxisProvider_Axis() {

-		return (EReference)axisProviderEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getSlaveObjectAxisProvider() {

-		return slaveObjectAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getMasterObjectAxisProvider() {

-		return masterObjectAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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);

-

-		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

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		abstractAxisProviderEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		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(), theEcorePackage.getEBoolean(), "disconnectSlave", null, 0, 1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iSlaveAxisProviderEClass, ISlaveAxisProvider.class, "ISlaveAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(axisProviderEClass, AxisProvider.class, "AxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAxisProvider_Axis(), theNattableaxisPackage.getIAxis(), null, "axis", null, 0, -1, AxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(slaveObjectAxisProviderEClass, SlaveObjectAxisProvider.class, "SlaveObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(masterObjectAxisProviderEClass, MasterObjectAxisProvider.class, "MasterObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-	}

-

-} //NattableaxisproviderPackageImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
deleted file mode 100644
index f26f29fc4a5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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 -->

- * <p>

- * </p>

- *

- * @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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
deleted file mode 100644
index 0dcbc27b928..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- 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 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.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
deleted file mode 100644
index d1752f9253b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- 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 -->

-	 * @parameter 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 = 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 = 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 = 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 = 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 = 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 = 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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
deleted file mode 100644
index 62a31c7313e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import 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 -->

- * @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 -->

-	 * @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 -->

-	 * @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 -->

-	 * @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

-	 */

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-	

-} //CellEditorDeclaration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
deleted file mode 100644
index a2d313d5772..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.ecore.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
deleted file mode 100644
index 759741f226a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
+++ /dev/null
@@ -1,613 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.ecore.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.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.nattableconfiguration.NattableconfigurationFactory

- * @model kind="package"

- * @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 = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__DESCRIPTION = EcorePackage.EMODEL_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 = EcorePackage.EMODEL_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 = EcorePackage.EMODEL_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 = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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 = EcorePackage.EMODEL_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>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 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 + 10;

-

-	/**

-	 * 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 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 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 '{@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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
deleted file mode 100644
index 83692926f9f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.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.nattabletester.AbstractTableTester;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration()

- * @model

- * @generated

- */

-public interface TableConfiguration extends TableNamedElement {

-	/**

-	 * Returns the value of the '<em><b>Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Type</em>' attribute.

-	 * @see #setType(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_Type()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Type</em>' attribute.

-	 * @see #getType()

-	 * @generated

-	 */

-	void setType(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Icon Path</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Icon Path</em>' attribute.

-	 * @see #setIconPath(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_IconPath()

-	 * @model

-	 * @generated

-	 */

-	String getIconPath();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Icon Path</em>' attribute.

-	 * @see #getIconPath()

-	 * @generated

-	 */

-	void setIconPath(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Creation Tester</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Creation Tester</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Creation Tester</em>' containment reference.

-	 * @see #setCreationTester(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 -->

-	 * <p>

-	 * If the meaning of the '<em>Cell Editor Declaration</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Row Header Axis 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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Column Header Axis 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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Column Axis Providers</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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Row Axis Providers</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>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 -->

-	 * <p>

-	 * If the meaning of the '<em>Default Row Axis Provider</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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 -->

-	 * <p>

-	 * If the meaning of the '<em>Default Column Axis Provider</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-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);

-

-} // TableConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
deleted file mode 100644
index 5a17ee1e0f8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Named Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement()

- * @model abstract="true"

- * @generated

- */

-public interface TableNamedElement extends EModelElement {

-	/**

-	 * Returns the value of the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Description</em>' attribute.

-	 * @see #setDescription(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.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 -->

-	 * <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.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Name()

-	 * @model

-	 * @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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
deleted file mode 100644
index 30fc3d889bb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.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.*;

-

-/**

- * <!-- 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

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
deleted file mode 100644
index c1b167590dc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.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.EcorePackage;

-

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.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.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.nattablelabelprovider.NattablelabelproviderPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-

-/**

- * <!-- 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();

-

-		// 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);

-

-		// Create package meta-data objects

-		theNattableconfigurationPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-

-		// 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

-	 */

-	public EClass getTableNamedElement() {

-		return tableNamedElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTableNamedElement_Description() {

-		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTableNamedElement_Name() {

-		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getTableConfiguration() {

-		return tableConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTableConfiguration_Type() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTableConfiguration_IconPath() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_CreationTester() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTableConfiguration_CellEditorDeclaration() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_RowHeaderAxisConfiguration() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_ColumnHeaderAxisConfiguration() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_ColumnAxisProviders() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_RowAxisProviders() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_DefaultRowAxisProvider() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_DefaultColumnAxisProvider() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EEnum getCellEditorDeclaration() {

-		return cellEditorDeclarationEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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);

-

-		// 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

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		tableNamedElementEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		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, 0, 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(), theEcorePackage.getEString(), "iconPath", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_CreationTester(), 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$

-

-		// 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);

-	}

-

-} //NattableconfigurationPackageImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
deleted file mode 100644
index cf2b01c86af..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
+++ /dev/null
@@ -1,699 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import 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.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:

- * <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>

- * </ul>

- * </p>

- *

- * @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;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableconfigurationPackage.Literals.TABLE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getType() {

-		return type;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setType(String newType) {

-		String oldType = type;

-		type = newType;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getIconPath() {

-		return iconPath;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setIconPath(String newIconPath) {

-		String oldIconPath = iconPath;

-		iconPath = newIconPath;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public 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

-	 */

-	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

-	 */

-	public CellEditorDeclaration getCellEditorDeclaration() {

-		return cellEditorDeclaration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	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

-	 */

-	@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);

-		}

-		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();

-		}

-		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;

-		}

-		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;

-		}

-		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;

-		}

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
deleted file mode 100644
index 847515c7dbd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-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;

-

-/**

- * <!-- 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:

- * <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>

- * </p>

- *

- * @generated

- */

-public abstract class TableNamedElementImpl extends EModelElementImpl 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

-	 */

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setDescription(String newDescription) {

-		String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION, oldDescription, description));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
deleted file mode 100644
index f5fe998d453..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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.*;

-

-/**

- * <!-- 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 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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
deleted file mode 100644
index 363019f1e9d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.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.*;

-

-/**

- * <!-- 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 -->

-	 * @parameter 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 = 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 = 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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
deleted file mode 100644
index 582c6d88cb9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration()

- * @model

- * @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 -->

-	 * <p>

-	 * If the meaning of the '<em>Display Is Derived</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 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 -->

-	 * <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#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 -->

-	 * <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#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 -->

-	 * <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#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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
deleted file mode 100644
index 935dfe4e360..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ILabel Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelProviderConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ILabelProviderConfiguration extends EModelElement {

-} // ILabelProviderConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
deleted file mode 100644
index b3b96be8f3c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
deleted file mode 100644
index 5f582149b38..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-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.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 = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * 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 = 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 ILABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * 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 = EcorePackage.EMODEL_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>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 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>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 number of operations of the '<em>Feature Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.

-	 * <!-- 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 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();

-

-	}

-

-} //NattablelabelproviderPackage

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
deleted file mode 100644
index 87075d8fa75..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()

- * @model

- * @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 -->

-	 * <p>

-	 * If the meaning of the '<em>Display Icon</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 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 -->

-	 * <p>

-	 * If the meaning of the '<em>Display Label</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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
deleted file mode 100644
index adaf18d690c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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:

- * <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>

- * </p>

- *

- * @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

-	 */

-	public boolean isDisplayIsDerived() {

-		return displayIsDerived;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	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.FEATURE_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.FEATURE_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.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ILabelProviderConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ILabelProviderConfigurationImpl.java
deleted file mode 100644
index df75d9ed0d7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ILabelProviderConfigurationImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>ILabel Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class ILabelProviderConfigurationImpl extends EModelElementImpl implements ILabelProviderConfiguration {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ILabelProviderConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablelabelproviderPackage.Literals.ILABEL_PROVIDER_CONFIGURATION;

-	}

-

-} //ILabelProviderConfigurationImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
deleted file mode 100644
index fedca1b6480..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-/**

- * <!-- 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();

-			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

-	 */

-	public FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration() {

-		FeatureLabelProviderConfigurationImpl featureLabelProviderConfiguration = new FeatureLabelProviderConfigurationImpl();

-		return featureLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration() {

-		ObjectLabelProviderConfigurationImpl objectLabelProviderConfiguration = new ObjectLabelProviderConfigurationImpl();

-		return objectLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
deleted file mode 100644
index 8b92e281743..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.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.nattabletester.NattabletesterPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-

-/**

- * <!-- 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;

-

-	/**

-	 * 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();

-

-		// 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);

-

-		// Create package meta-data objects

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.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

-	 */

-	public EClass getILabelProviderConfiguration() {

-		return iLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getFeatureLabelProviderConfiguration() {

-		return featureLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayType() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayName() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getObjectLabelProviderConfiguration() {

-		return objectLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {

-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {

-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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);

-	}

-

-	/**

-	 * <!-- 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

-		iLabelProviderConfigurationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		featureLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());

-		objectLabelProviderConfigurationEClass.getESuperTypes().add(this.getILabelProviderConfiguration());

-

-		// 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(), theEcorePackage.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(), theEcorePackage.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(), theEcorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayName(), theEcorePackage.getEBoolean(), "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-

-		initEClass(objectLabelProviderConfigurationEClass, ObjectLabelProviderConfiguration.class, "ObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), theEcorePackage.getEBoolean(), "displayIcon", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getObjectLabelProviderConfiguration_DisplayLabel(), theEcorePackage.getEBoolean(), "displayLabel", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-} //NattablelabelproviderPackageImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
deleted file mode 100644
index d74716abc18..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- 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:

- * <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>

- * </p>

- *

- * @generated

- */

-public class ObjectLabelProviderConfigurationImpl extends 

-EModelElementImpl 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

-	 */

-	public boolean isDisplayIcon() {

-		return displayIcon;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-	 */

-	public boolean isDisplayLabel() {

-		return displayLabel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
deleted file mode 100644
index 9dee4e36319..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-/**

- * <!-- 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 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.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.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;

-	}

-

-} //NattablelabelproviderAdapterFactory

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
deleted file mode 100644
index 827ea9688a5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-/**

- * <!-- 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 -->

-	 * @parameter 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 = 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 = 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 = caseEModelElement(objectLabelProviderConfiguration);

-				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>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;

-	}

-

-} //NattablelabelproviderSwitch

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
deleted file mode 100644
index 07017b26a57..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getAbstractTableTester()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractTableTester extends EModelElement {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getTester();

-

-} // AbstractTableTester

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
deleted file mode 100644
index 8d2287e382f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Java Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester()

- * @model

- * @generated

- */

-public interface JavaTableTester extends AbstractTableTester {

-	/**

-	 * Returns the value of the '<em><b>Tester</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Tester</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Tester</em>' attribute.

-	 * @see #setTester(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester_Tester()

-	 * @model required="true"

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
deleted file mode 100644
index 46e2ab54104..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
deleted file mode 100644
index 20eac7f008e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.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 = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * 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 = 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 ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Tester</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_TESTER = EcorePackage.EMODEL_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 = EcorePackage.EMODEL_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>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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
deleted file mode 100644
index 06c89a75b9f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-

-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 -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class AbstractTableTesterImpl extends EModelElementImpl 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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
deleted file mode 100644
index ba7dfd6a22d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>

- * </ul>

- * </p>

- *

- * @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

-	 */

-	public String getTester() {

-		return tester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setTester(String newTester) {

-		String oldTester = tester;

-		tester = newTester;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
deleted file mode 100644
index 54d6e4c6e48..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-/**

- * <!-- 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

-	 */

-	public JavaTableTester createJavaTableTester() {

-		JavaTableTesterImpl javaTableTester = new JavaTableTesterImpl();

-		return javaTableTester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
deleted file mode 100644
index 861b4ea1f17..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.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.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;

-

-/**

- * <!-- 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();

-

-		// 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);

-

-		// Create package meta-data objects

-		theNattabletesterPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattabletesterPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattableaxisPackage.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

-	 */

-	public EClass getAbstractTableTester() {

-		return abstractTableTesterEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation getAbstractTableTester__GetTester() {

-		return abstractTableTesterEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getJavaTableTester() {

-		return javaTableTesterEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getJavaTableTester_Tester() {

-		return (EAttribute)javaTableTesterEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		abstractTableTesterEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
deleted file mode 100644
index a6b7df87f1f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.nattabletester.*;

-

-/**

- * <!-- 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 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 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
deleted file mode 100644
index c683d173144..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.nattabletester.*;

-

-/**

- * <!-- 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 -->

-	 * @parameter 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 = 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 = 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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
deleted file mode 100644
index a34c1bc1e30..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- 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 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.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
deleted file mode 100644
index 1d8ac260f56..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.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.*;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- 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 -->

-	 * @parameter 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 = 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>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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki
deleted file mode 100644
index 1564bbf26e5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki
+++ /dev/null
@@ -1,80 +0,0 @@
-=Metamodel Description= 

-==CellEditorDeclaration==

-This enumeration allows to describe the way to declare the cell editor in the table : 

-<li>by column </li>

-<li>by row </li>

-<li>by cell </li>

-

-==AxisIndexStyle==

-This enumeration allows to describe how to display the index of the axis : 

-<li>Alphabetic : A, B, C ... Y, Z, AA, AB, ... </li>

-<li>Numeric : 1, 2, 3 </li>

-

-==TableNamedElement==

-abstract object used when an element need to have a name and a description

-

-==TableConfiguration==

-this object is used to configure the table

-

-===Fields=== 

- <li>type : the type of the table</li>

- <li>iconPath : the icon associated to the table</li>

- <li>cellEditorDeclaration : describe how the cell editor will be declared in the table : They can be declared by row, by column or by cells</li>

- <li>rowAxisProviders : the possible axis providers used for rows for this configuration</li>

- <li>columnAxisProviders : the possible axis providers used for the columns for this configuration</li>

- <li>defaultRowAxisProvider : the axis provider used for row just after the table creation </li>

- <li>defaultColumnAxisProvider : the axis provider used for column just after the table creation </li>

- 

- 

- ????rowAxisProviderConfiguration -> a la bonne place ? -> peut-être sur un (local)AbstractAxisProvider?

- ????columnAxisProviderConfiguration -> à la bonne place? -> peut-être sur un (local)AbstractAxisProvider?

- 

- ===Constraints===

- the field defaultRowAxisProvider must references an axis owned by rowAxisProviders

- the field defaultColumnAxisProvider must references an axis owned by columnAxisProviders

-  

-

-==Table==

-This object represents the model of the table used in Papyrus

-===Fields===

-<li>invertAxis : indicates if the rows and the columns are inverted</li>

-<li>tableConfiguration : the configuration used for the table</li>

-<li>currentColumnAxisProvider : the current axis provider used for columns</li>

-<li>currentRowAxisProvider : the current axis provider used for rows</li>

-<li>rowAxisProvidersHistory : an history of the axis provider used for rows</li>

-<li>columnAxisProvidersHistory : an history of the axis provider used for columns</li>

- 

-===Constraints===

-<li>the field currentRowAxisProvider must references an axis owned by rowAxisProviderHistory</li>

-<li>The field currentColumnAxisProvider must references one of axis provider referenced by columnAxisProviderHistory </li>

-<li>the field rowAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several row axis providers in rowAxisProviders</li>

-<li>the field columnAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several column axis providers in columnAxisProviders</li>

-<li> the axis providers owned by columnAxisProviderHistory and rowAxisProviderHistory contains only the axis provider already used by the user. </li>

-

-

-??? localTableConfiguration : must be here?

-

-??? add header in the name of the label configuration????

-==AbstractLabelConfiguration==

-This object allows to store the configuration for the label provider.

-===Fields===

-<li>labelProviderContext : the context to use to find the label provider to use</li>

-

-

-==ObjectLabelProviderConfiguration==

-This label provider can be used for all element displayed in a table

-===Fields===

-<li>displayIcon : indicates if we want display the icon of the object in the header</li>

-<li>displayLabel : indicates if we want display the label of the object in the header</li>

-

-==FeatureLabelProviderConfiguration==

-The label provider used for object representing properties/features of others objects

-===Fields===

-<li>displayIsDerived: indicates if we want display the "/" for the derived feature</li>

-<li>displayType: indicates if we want display the type of the feature</li>

-<li>displayMultiplicity: : indicates if we want display the multiplicity of the feature</li>

-<li>displayName:indicates if the want display the name of the feature</li>

-

-

-==AbstractAxisProvider==

-This class stores in an ordered list the IAxis displayed in rows or in columns
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/.project
deleted file mode 100644
index d459a34bf07..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.modelexplorer</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
deleted file mode 100644
index f46dc141f16..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="0.10.0",
- org.eclipse.emf.facet.infra.query.core,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.papyrus.infra.core,
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.papyrus.infra.widgets,
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.core.expressions,
- com.google.guava
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,bin
-Bundle-Vendor: %Bundle-Vendor
-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
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 6d67e6f3dba..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.modelexplorer

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Modelexplorer for Tables (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/build.properties
deleted file mode 100644
index af08ccbab2b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               resources/,\
-               plugin.pdoc,\
-               OSGI-INF/
-src.includes = about.html
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.pdoc
deleted file mode 100644
index 081f9a207f6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides : &#xD;&#xA;&#x9;- the facets and the customization to display the Papyrus Nattables in the ModelExplorer">

-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.xml
deleted file mode 100644
index 01a4149096f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension point="org.eclipse.emf.facet.infra.query.registration">

-      <modelqueryset file="resources/PapyrusTablesFacet.querySet">

-      </modelqueryset>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">

-      <browserCustomization file="resources/PapyrusTables.uiCustom" loadByDefault="true"/>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">

-      <browserCustomization file="resources/PapyrusTablesFacet.uiCustom" loadByDefault="true"/>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.facet.registration">

-      <facetset file="resources/PapyrusTablesFacet.facetSet">

-      </facetset>

-   </extension>

-   <extension point="org.eclipse.ui.handlers">

-      <handler class="org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.RenameTableHandler" commandId="org.eclipse.ui.edit.rename">

-         <activeWhen>

-      

-               <with variable="selection">

-                  <test forcePluginActivation="true" property="org.eclipse.papyrus.infra.nattable.modelexplorer.tablepropertytester.isTable" value="true">

-                  </test>

-               </with>

-            

-         </activeWhen>

-      </handler>

-   </extension>

-      <extension

-            point="org.eclipse.core.expressions.propertyTesters">

-         <propertyTester

-               class="org.eclipse.papyrus.infra.nattable.modelexplorer.providers.TablePropertyTester"

-               id="org.eclipse.papyrus.infra.nattable.modelexplorer.tablepropertytester"

-               namespace="org.eclipse.papyrus.infra.nattable.modelexplorer.tablepropertytester"

-               properties="isTable"

-               type="org.eclipse.jface.viewers.IStructuredSelection">

-         </propertyTester>

-      </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTables.uiCustom b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTables.uiCustom
deleted file mode 100644
index c9113c988f7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTables.uiCustom
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/papyrus/nattable/model">

-  <types metaclassName="nattable.Table">

-    <references referenceName="context">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="eAnnotations">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="tableConfiguration">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="columnAxisProvidersHistory">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="rowAxisProvidersHistory">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="localRowHeaderAxisConfiguration">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="localColumnHeaderAxisConfiguration">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="currentColumnAxisProvider">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="currentRowAxisProvider">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-  </types>

-</uicustom:MetamodelView>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.facetSet b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.facetSet
deleted file mode 100644
index bbca3816dbc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.facetSet
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<facet:FacetSet 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:facet="http://www.eclipse.org/EmfFacet/infra/facet/0.8.incubation" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="PapyrusTablesFacet" nsURI="http://org.eclipse.org/papyrus/tables/modelExplorer/Facet" nsPrefix="PapyrusTablesFacet">

-  <eClassifiers xsi:type="facet:Facet" name="TableContainer" abstract="true">

-    <eSuperTypes href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <eStructuralFeatures xsi:type="facet:FacetReference" name="tables" upperBound="-1" volatile="true" unsettable="true">

-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-      <valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTablesFacet#GetContainedTables"></valueQuery>

-    </eStructuralFeatures>

-    <conditionQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTablesFacet#IsTableContainer"/>

-  </eClassifiers>

-  <extendedPackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>

-</facet:FacetSet>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.querySet b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.querySet
deleted file mode 100644
index 2b220c97629..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.querySet
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<query:ModelQuerySet 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:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="PapyrusTablesFacet" description="A set of queries to manage the tables in the ModelExplorer">

-  <associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>

-  <associatedMetamodels href="http://www.eclipse.org/papyrus/nattable/model#/"/>

-  <queries xsi:type="query:JavaModelQuery" name="IsTableContainer" description="Return true if the element contains tables" implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.IsTableContainer">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    <scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetContainedTables" description="Get the collection of all contained tables" upperBound="-1" implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetContainedTables">

-    <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-    <scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </queries>

-</query:ModelQuerySet>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.uiCustom b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.uiCustom
deleted file mode 100644
index 4149fcb9fe5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTablesFacet.uiCustom
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://org.eclipse.org/papyrus/tables/modelExplorer/Facet">

-  <types metaclassName="PapyrusTablesFacet.TableContainer">

-    <references referenceName="tables">

-      <customizedFeatures>

-        <valueCases>

-          <value xsi:type="uicustom:StaticFeatureValue" value="false"/>

-          <condition xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTablesFacet#IsTableContainer"/>

-        </valueCases>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-      <customizedFeatures customizedFeature="collapseLink">

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="true"/>

-      </customizedFeatures>

-    </references>

-  </types>

-</uicustom:MetamodelView>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/Activator.java
deleted file mode 100644
index ce4b79e764e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/Activator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer;

-

-import org.eclipse.core.runtime.Plugin;

-import org.osgi.framework.BundleContext;

-

-/** The activator class controls the plug-in life cycle */

-public class Activator extends Plugin {

-

-	// The shared instance

-	private static Activator plugin;

-

-	@Override

-	public void start(final BundleContext context) throws Exception {

-		super.start(context);

-		Activator.plugin = this;

-	}

-

-

-	@Override

-	public void stop(final BundleContext context) throws Exception {

-		Activator.plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 * 

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return Activator.plugin;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractTableCommandHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractTableCommandHandler.java
deleted file mode 100644
index 62f0c61e6ef..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractTableCommandHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;

-import org.eclipse.ui.PlatformUI;

-

-public abstract class AbstractTableCommandHandler extends AbstractCommandHandler {

-

-	/**

-	 * Returns the list of selected tables

-	 * 

-	 * @return the list of selected tables

-	 */

-	protected List<Table> getSelectedTables() {

-		List<Table> tables = new ArrayList<Table>();

-		ISelection selection = null;

-

-		// Get current selection

-		selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-

-		// Get first element if the selection is an IStructuredSelection

-		if(selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection)selection;

-			Iterator<?> iter = structuredSelection.iterator();

-			while(iter.hasNext()) {

-				Object current = iter.next();

-				/**

-				 * Get the table object. This getElement is used in order to

-				 * use IAdaptable mechanisme For example for Facet Elements

-				 */

-				EObject table = NavigatorUtils.getElement(current, EObject.class);

-				if(table instanceof Table) {

-					tables.add((Table)table);

-				}

-			}

-		}

-

-		return tables;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/RenameTableHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/RenameTableHandler.java
deleted file mode 100644
index a304751d89e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/RenameTableHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.jface.dialogs.InputDialog;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.modelexplorer.messages.Messages;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * This handler provides the method to rename a Table

- * 

- * 

- * 

- */

-public class RenameTableHandler extends AbstractTableCommandHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		List<Table> tables = getSelectedTables();

-		if(editingDomain != null && tables.size() == 1) {

-

-			final Table table = tables.get(0);

-			final String currentName = table.getName();

-			if(currentName != null) {

-

-				AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(editingDomain, "RenameTableCommand", null) { //$NON-NLS-1$

-

-					@Override

-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) {

-						InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameTableHandler_RenameAnExistingTable, Messages.RenameTableHandler_NewName, currentName, null);

-						if(dialog.open() == Window.OK) {

-							final String name = dialog.getValue();

-							if(name != null && name.length() > 0) {

-								table.setName(name);

-							}

-							return CommandResult.newOKCommandResult();

-						} else {

-							return CommandResult.newCancelledCommandResult();

-						}

-					}

-				};

-				return new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(cmd);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/Messages.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/Messages.java
deleted file mode 100644
index 29554ead78a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.modelexplorer.messages.messages"; //$NON-NLS-1$

-

-	public static String DuplicateTableHandler_CopyOf;

-

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/messages.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/messages.properties
deleted file mode 100644
index 4cd13849a21..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-DuplicateTableHandler_CopyOf=Copy Of {0}

-RenameTableHandler_NewName=New name:

-RenameTableHandler_RenameAnExistingTable=Rename an existing table

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/providers/TablePropertyTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/providers/TablePropertyTester.java
deleted file mode 100644
index 21f06ab73ac..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/providers/TablePropertyTester.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.providers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-

-/**

- * This class provides test called by the plugin.xml in order to know if handlers should be active or not.

- * 

- * Sometimes these test can be done directly in the plugin.xml in the activeWhen (with instanceof, adapt, ...),

- * but in this case, Eclipse doesn't refresh correctly the status of the command in the menu Edit or in other menu.

- * 

- * 

- * FIXME : i think this class is not yet used

- */

-public class TablePropertyTester extends PropertyTester {

-

-

-	/** property to test if the selected elements is a table */

-	public static final String IS_TABLE = "isTable"; //$NON-NLS-1$

-

-

-	/**

-	 * 

-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

-	 * 

-	 * @param receiver

-	 * @param property

-	 * @param args

-	 * @param expectedValue

-	 * @return

-	 */

-	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		if(IS_TABLE.equals(property) && receiver instanceof IStructuredSelection) {

-			boolean answer = isTable((IStructuredSelection)receiver);

-			return new Boolean(answer).equals(expectedValue);

-		}

-		return false;

-	}

-

-

-

-	/**

-	 * Tests the selection in order to know if it contains only {@link Table}

-	 * 

-	 * @param selection

-	 * @return

-	 *         <code>true</code> if the selection is composed by {@link Table}

-	 * 

-	 *         FIXME : this method should be in an upper plugin like oep.infra.gmfdiag.common

-	 *         FIXME : why use this one and not the other method isTable (see upper in this class)

-	 */

-	private boolean isTable(IStructuredSelection selection) {

-		if(!selection.isEmpty()) {

-			Iterator<?> iter = selection.iterator();

-			while(iter.hasNext()) {

-				/**

-				 * Set to use the IAdaptable mechanism

-				 * Used for example for facet elements

-				 */

-				final Object next = iter.next();

-				EObject object = NavigatorUtils.getElement(next, EObject.class);

-				if(!(object instanceof Table)) {

-					return false;

-				}

-			}

-			return true;

-		}

-		return false;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetContainedTables.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetContainedTables.java
deleted file mode 100644
index ee0b8b81bb3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetContainedTables.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.nattable.modelexplorer.queries;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
-import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
-import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
-/** Get the collection of all contained tables */
-public class GetContainedTables extends AbstractEditorContainerQuery implements IJavaModelQuery<EObject, Collection<org.eclipse.papyrus.infra.nattable.model.nattable.Table>> {
-
-	public Collection<org.eclipse.papyrus.infra.nattable.model.nattable.Table> evaluate(final EObject context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		Predicate<EStructuralFeature.Setting> p = new Predicate<EStructuralFeature.Setting>() {
-
-			public boolean apply(EStructuralFeature.Setting arg0) {
-				return arg0.getEObject() instanceof Table;
-			}
-		};
-		Function<EStructuralFeature.Setting, Table> f = new Function<EStructuralFeature.Setting, Table>() {
-
-			public Table apply(EStructuralFeature.Setting arg0) {
-				return (Table)arg0.getEObject();
-			}
-
-		};
-		return NavigatorUtils.findFilterAndApply(context, p, f);
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java
deleted file mode 100644
index 868621252eb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.queries;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;

-import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;

-import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;

-

-import com.google.common.base.Predicate;

-

-public class IsTableContainer extends AbstractEditorContainerQuery implements IJavaModelQuery<EObject, Boolean> {

-

-	/**

-	 * Return true if the element is a Diagram Container

-	 */

-	public Boolean evaluate(EObject context, ParameterValueList parameterValues) throws ModelQueryExecutionException {

-		Predicate<Setting> p = new Predicate<Setting>() {

-

-			public boolean apply(Setting arg0) {

-				return arg0.getEObject() instanceof Table;

-			}

-		};

-		return NavigatorUtils.find(context, p);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/.project
deleted file mode 100644
index aa7f080ea05..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.views.config</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
deleted file mode 100644
index 9714ef3ace9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.config;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core,
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="0.10.0",
- org.eclipse.emf.edit,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
- org.eclipse.emf.transaction,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.tools;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-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
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 928ca7a4737..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.views.editor.config

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Papyrus Views Config (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/build.properties
deleted file mode 100644
index 5d4530103a8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               icons/,\

-               resources/,\

-               plugin.xml

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.gif
deleted file mode 100644
index 20416f02be0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png
deleted file mode 100644
index 3eb64f31e36..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml
deleted file mode 100644
index e6fc4ce7a79..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.axismanager">

-      <axisManager

-            id="org.eclipse.papyrus.infra.nattable.pagelist.contents.axis.manager"

-            manager="org.eclipse.papyrus.infra.nattable.views.config.manager.axis.EditorContextSynchronizerAxisManager">

-      </axisManager>

-      <axisManager

-            id="org.eclipse.papyrus.infra.nattable.page.view.feature.axis.manager"

-            manager="org.eclipse.papyrus.infra.nattable.views.config.manager.axis.EditorFeatureAxisManager">

-      </axisManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.cellmanager">

-      <cellManager

-            id="org.eclipse.papyrus.infra.nattable.page.editor.modelviewscellmanager"

-            manager="org.eclipse.papyrus.infra.nattable.views.config.manager.cell.ModelViewsCellManager"

-            order="50">

-      </cellManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="1000"

-            provider="org.eclipse.papyrus.infra.nattable.views.config.provider.ModelViewsHeaderLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider">

-         </labelProviderContext>

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.celleditor.configuration">

-      <configuration

-            class="org.eclipse.papyrus.infra.nattable.views.config.celleditor.ModelViewsCellEditorConfiguration"

-            order="50">

-      </configuration>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.tester">

-      <tester

-            class="org.eclipse.papyrus.infra.nattable.views.config.utils.TableViewCreationTester"

-            id="org.eclipse.papyrus.infra.nattable.views.config.creation.tester">

-      </tester>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.configuration">

-      <configuration

-            file="resources/viewpage.nattableconfiguration">

-      </configuration>

-   </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
deleted file mode 100644
index 3992a664634..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns: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="PapyrusTableViewsEditor" 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 xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.infra.nattable.pagelist.contents.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
deleted file mode 100644
index 95ecdb7434d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-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.editor.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
deleted file mode 100644
index db111a71c4d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.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) {

-		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) {

-		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 getEditorId() {

-		return CONFIG_EDITOR_ID;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
deleted file mode 100644
index aeb9e26a886..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class EditorContextSynchronizerAxisManager extends AbstractSynchronizedOnFeatureAxisManager {

-

-	/**

-	 * we keep it to be able to remove the listener during the destruction of the table

-	 */

-	private PageList pageList;

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider)

-	 * 

-	 * @param manager

-	 * @param rep

-	 * @param provider

-	 */

-	@Override

-	public void init(INattableModelManager manager, AxisManagerRepresentation rep, AbstractAxisProvider provider) {

-		super.init(manager, rep, provider);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#addContextFeatureValueListener()

-	 * 

-	 */

-	@Override

-	protected void addContextFeatureValueListener() {

-		this.featureListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if(msg.getFeature() == DiPackage.eINSTANCE.getPageList_AvailablePage()) {

-					getTableManager().updateAxisContents(getRepresentedContentProvider());

-				}

-			}

-		};

-		getPageList().eAdapters().add(this.featureListener);

-	}

-

-	private PageList getPageList() {

-		if(this.pageList == null) {

-			this.pageList = Utils.getPageList(getTableManager().getTable());

-		}

-		return this.pageList;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#verifyCoupleContextFeature()

-	 * 

-	 */

-	@Override

-	protected void verifyCoupleContextFeature() {

-		//nothing to do

-	}

-

-

-	/**

-	 * 

-	 * @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 = CellManagerFactory.INSTANCE.getCrossValue(page, Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_CONTEXT);

-		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() {

-		if(getPageList() != null) {

-			getPageList().eAdapters().remove(this.featureListener);

-		}

-		this.pageList = null;

-		super.dispose();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Collection<Object> getAllManagedAxis() {

-		final PageList pageList = Utils.getPageList(getTableManager().getTable());

-		final List<Object> elements = new ArrayList<Object>();

-		elements.clear();

-		for(final PageRef ref : pageList.getAvailablePage()) {

-			final Object page = ref.getPageIdentifier();

-			if(mustBeDisplayedInThisTable(page)) {

-				elements.add(page);

-			}

-		}

-		return elements;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-	@Override

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		return false;

-	}

-

-	@Override

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
deleted file mode 100644
index 56cb61ce6e4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-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

-	 */

-	public boolean isDynamic() {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 * 

-	 * @return

-	 */

-	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(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Integer)

-	 * 

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java
deleted file mode 100644
index 88122c5b2de..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.manager.cell;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * The Cell manager for the ModelViews table

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class ModelViewsCellManager extends AbstractCellManager {

-

-	/**

-	 * 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 obj1

-	 * @param obj2

-	 * @return

-	 */

-	protected List<Object> organizeObject(final Object obj1, final Object obj2) {

-		final List<Object> objects = new ArrayList<Object>();

-		if(obj1 instanceof String && ((String)obj1).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID)) {

-			objects.add(obj2);

-			objects.add(obj1);

-		} else if(obj2 instanceof String && ((String)obj2).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID)) {

-			objects.add(obj1);

-			objects.add(obj2);

-		}

-		if(objects.size() == 2) {

-			final Object first = objects.get(0);

-			if(first instanceof EObject) {

-				final IPageManager mngr = Utils.getIPagneManager((EObject)first);

-				if(mngr != null && !mngr.allPages().contains(first)) {

-					return Collections.emptyList();

-				}

-			}

-		}

-

-		return objects;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handles(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	public boolean handles(Object obj1, Object obj2) {

-		return organizeObject(obj1, obj2).size() == 2;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handlesAxisElement(java.lang.Object)

-	 * 

-	 * @param obj

-	 * @return

-	 */

-	public boolean handlesAxisElement(Object obj) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getValue(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	public Object getValue(Object obj1, Object obj2) {

-		final List<Object> objects = organizeObject(obj1, obj2);

-		final String featureName = ((String)objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		final Object editor = objects.get(0);

-		if(Utils.VIEW_NAME.equals(featureName)) {

-			return getEditorName(editor);

-		}

-		if(Utils.VIEW_CONTEXT.equals(featureName)) {

-			return getEditorContext(editor);

-		}

-		if(Utils.VIEW_IS_OPEN.equals(featureName)) {

-			return getEditorIsOpen(editor);

-		}

-		if(Utils.VIEW_EDITOR_TYPE.equals(featureName)) {

-			return getEditorType(editor);

-		}

-		return NOT_AVALAIBLE;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 *         <code>true</code> excepted if the edited feature is isOpen

-	 */

-	public boolean isCellEditable(Object obj1, Object obj2) {

-		final List<Object> objects = organizeObject(obj1, obj2);

-		final String featureName = ((String)objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		return featureName.equals(Utils.VIEW_NAME);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getSetValueCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Object, java.lang.Object, java.lang.Object)

-	 * 

-	 * @param domain

-	 * @param obj1

-	 * @param obj2

-	 * @param newValue

-	 * @return

-	 */

-	public Command getSetValueCommand(EditingDomain domain, Object obj1, Object obj2, Object newValue) {

-		final List<Object> objects = organizeObject(obj1, obj2);

-		if(objects.get(0) instanceof EObject) {

-			final EObject editor = (EObject)objects.get(0);

-			final String featureName = ((String)objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-			if(Utils.VIEW_NAME.equals(featureName)) {

-				EStructuralFeature feature = editor.eClass().getEStructuralFeature(Utils.VIEW_NAME);

-				final AbstractEditCommandRequest request = new SetRequest((TransactionalEditingDomain)domain, editor, feature, newValue);

-				final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editor);

-				return new GMFtoEMFCommandWrapper(provider.getEditCommand(request));

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param editor

-	 *        an editor

-	 * @return

-	 *         the type of the editor

-	 */

-	protected Object getEditorType(final Object editor) {

-		if(editor instanceof EObject) {

-			if(editor instanceof Table) {

-				return ((Table)editor).getTableConfiguration().getType();

-			} else {

-				EStructuralFeature feature = ((EObject)editor).eClass().getEStructuralFeature(Utils.VIEW_EDITOR_TYPE);

-				if(feature != null) {

-					return ((EObject)editor).eGet(feature);

-				}

-			}

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 * 

-	 * @param editor

-	 *        the editor

-	 * @return

-	 *         <code>true</code> if the current editor is open

-	 */

-	protected Object getEditorIsOpen(final Object editor) {

-		if(editor instanceof EObject) {

-			IPageManager mngr = null;

-			try {

-				mngr = ServiceUtilsForResource.getInstance().getIPageManager(((EObject)editor).eResource());

-				return mngr.isOpen(editor);

-			} catch (ServiceException e) {

-				Activator.log.error(e);

-			}

-		}

-

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 * 

-	 * @param editor

-	 *        an editor

-	 * @return

-	 *         the name of the editor

-	 */

-	protected Object getEditorName(final Object editor) {

-		if(editor instanceof EObject) {

-			if(editor instanceof EObject) {

-				final EObject eobject = (EObject)editor;

-				EStructuralFeature feature = eobject.eClass().getEStructuralFeature(Utils.VIEW_NAME);

-				if(feature != null) {

-					return eobject.eGet(feature);

-				}

-			}

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 * 

-	 * @param editor

-	 *        the editor

-	 * @return

-	 *         the context of this editor

-	 */

-	protected 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 NOT_AVALAIBLE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
deleted file mode 100644
index 22fed7d91a3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
deleted file mode 100644
index d2e3e095d46..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
deleted file mode 100644
index e7d3d5163d5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.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.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-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 ILabelProviderContextElement) {

-			final Object object = ((ILabelProviderContextElement)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 Object object = ((ILabelProviderContextElement)element).getObject();

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		final String id = AxisUtils.getPropertyId(object);

-		final 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 LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

-			return "";

-		}

-		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 LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

-			return null;

-		}

-		final Object object = ((ILabelProviderContextElement)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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
deleted file mode 100644
index 181c31d91d7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.nattable.tester.ITableTester;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-import org.eclipse.papyrus.infra.nattable.views.config.messages.Messages;

-import org.eclipse.papyrus.uml.tools.model.UmlModel;

-

-

-public class TableViewCreationTester implements ITableTester {

-

-

-	public IStatus isAllowed(Object context) {

-		if(context instanceof EObject) {

-			final EObject current = (EObject)context;

-			if(current.eResource() != null && current.eResource().getURI().fileExtension().equals(UmlModel.UML_FILE_EXTENSION)) {//FIXME remove the uml dependency

-				return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCanBeCreated);

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCantBeCreated);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
deleted file mode 100644
index a0edf952196..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-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 = "PapyrusTableViewsEditor";

-

-	/**

-	 * 

-	 * @return

-	 *         the page list used for this model

-	 */

-	public static final PageList getPageList(final Table table) {

-		final Resource resource = table.eResource();

-		final ModelSet modelSet = (ModelSet)resource.getResourceSet();

-		final Resource diResource = modelSet.getAssociatedResource(resource, DiModel.DI_FILE_EXTENSION, false);

-		final SashWindowsMngr windowMngr = DiUtils.lookupSashWindowsMngr(diResource);

-		final PageList pageList = windowMngr.getPageList();

-		assert pageList != null;

-		return pageList;

-	}

-

-	/**

-	 * 

-	 * @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().getIPageManager(eobject.eResource());

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return mngr;

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.project
deleted file mode 100644
index 511a6616987..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.views.editor</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index 963fb96cfd1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.editor;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.infra.gmfdiag.commands,
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.views.config;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 56bc805a60e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.page.editor

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Papyrus Page Nattable Editor (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
deleted file mode 100644
index e55d3d94491..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html,\

-               build.properties,\

-               icons/,\

-               resources/

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
deleted file mode 100644
index c0828dd966e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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>

-   </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="PapyrusTableViewsEditor">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         id="create.table.menus"

-         name="Create Table Menus"

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="toolbar:org.eclipse.papyrus.infra.nattable.toolbar.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-            icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png">

-      </image>

-   </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.classpath b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.classpath
deleted file mode 100644
index f0c973db676..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry excluding="org/eclipse/papyrus/infra/nattable/row/reorder/DefaultReorderBindings.java|org/eclipse/papyrus/infra/nattable/row/reorder/DefaultRowReorderLayerConfiguration.java|org/eclipse/papyrus/infra/nattable/row/reorder/MultiRowReorderCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/MultiRowReorderCommandHandler.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderCommandHandler.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderDragMode.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderEndCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderEndCommandHandler.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderEvent.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderLayer.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderStartCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderStartCommandHandler.java|org/eclipse/papyrus/infra/nattable/celleditor/configs/IAxisEStructuralFeatureCellEditorConfiguration.java" kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.project b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.project
deleted file mode 100644
index 552b9235cf4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
deleted file mode 100644
index eef1d5ec387..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator
-Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.core.runtime,
- org.eclipse.emf.transaction,
- org.eclipse.emf.ecore,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.emf.edit,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.swt,
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",
- org.eclipse.papyrus.infra.tools;bundle-version="0.10.0",
- org.eclipse.emf.edit.ui,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.papyrus.infra.nattable,
- org.eclipse.papyrus.infra.nattable.celleditor,
- org.eclipse.papyrus.infra.nattable.celleditor.config,
- org.eclipse.papyrus.infra.nattable.configuration,
- org.eclipse.papyrus.infra.nattable.dataprovider,
- org.eclipse.papyrus.infra.nattable.handler,
- org.eclipse.papyrus.infra.nattable.layerstack,
- org.eclipse.papyrus.infra.nattable.listener,
- org.eclipse.papyrus.infra.nattable.manager.axis,
- org.eclipse.papyrus.infra.nattable.manager.cell,
- org.eclipse.papyrus.infra.nattable.manager.table,
- org.eclipse.papyrus.infra.nattable.messages,
- org.eclipse.papyrus.infra.nattable.nattableconfiguration,
- org.eclipse.papyrus.infra.nattable.painter,
- org.eclipse.papyrus.infra.nattable.provider,
- org.eclipse.papyrus.infra.nattable.reorder,
- org.eclipse.papyrus.infra.nattable.tester,
- org.eclipse.papyrus.infra.nattable.utils,
- org.eclipse.papyrus.infra.nattable.widget
-Import-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index b5afc41d77d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.nattable

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Common Plugin for Papyrus Table (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/about.html b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/build.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/build.properties
deleted file mode 100644
index 0444389db8a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               icons/,\

-               about.html,\

-               plugin.pdoc,\

-               OSGI-INF/,\

-               schema/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyColumn.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyColumn.gif
deleted file mode 100644
index 923c3e23846..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyColumn.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyRow.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyRow.gif
deleted file mode 100644
index 75d6a723d47..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyRow.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/auto_resize_column.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/auto_resize_column.png
deleted file mode 100644
index 2b2dafef7aa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/auto_resize_column.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/auto_resize_row.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/auto_resize_row.png
deleted file mode 100644
index 6966e72844b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/auto_resize_row.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/columnIndex.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/columnIndex.png
deleted file mode 100644
index 7e30e8bc981..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/columnIndex.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/delete_obj.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/delete_obj.gif
deleted file mode 100644
index b6922ac11cf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/delete_obj.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/empty.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/empty.gif
deleted file mode 100644
index 30c569ad03e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/empty.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/empty.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/empty.png
deleted file mode 100644
index 91e5ec5fa2d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/empty.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/invertAxis.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/invertAxis.gif
deleted file mode 100644
index c4b9ea918a0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/invertAxis.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/label.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/label.png
deleted file mode 100644
index 2d68e6cd17d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/label.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/not_NA.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/not_NA.gif
deleted file mode 100644
index 125919fbd84..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/not_NA.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/not_NA.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/not_NA.png
deleted file mode 100644
index 7e2aeeeb7ed..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/not_NA.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/remove_column.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/remove_column.gif
deleted file mode 100644
index f8afafa242c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/remove_column.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/remove_row.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/remove_row.gif
deleted file mode 100644
index 23a70e32522..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/remove_row.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/rename.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/rename.gif
deleted file mode 100644
index e6f786eca9a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/rename.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/rowIndex.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/rowIndex.png
deleted file mode 100644
index 33b0b8df394..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/rowIndex.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/select_columns_to_show.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/select_columns_to_show.png
deleted file mode 100644
index 5a2446c88ef..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/select_columns_to_show.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_A_to_Z.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_A_to_Z.gif
deleted file mode 100644
index a0a3beb2759..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_A_to_Z.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_Z_to_A.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_Z_to_A.gif
deleted file mode 100644
index ade5eee2ac9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_Z_to_A.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_A_to_Z.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_A_to_Z.gif
deleted file mode 100644
index eb7d66ba90c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_A_to_Z.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_Z_to_A.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_Z_to_A.gif
deleted file mode 100644
index 67867a4b5be..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_Z_to_A.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/table.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/table.gif
deleted file mode 100644
index 4c9048708b0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/table.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/table.png b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/table.png
deleted file mode 100644
index 2a979527f4a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/table.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/tableColumnAction.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/tableColumnAction.gif
deleted file mode 100644
index 402a76128b8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/tableColumnAction.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/tableRowAction.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/tableRowAction.gif
deleted file mode 100644
index c1dee5f677c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/icons/tableRowAction.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/plugin.pdoc
deleted file mode 100644
index 95c3e133726..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the common classes for the Papyrus nattable editor">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/plugin.xml
deleted file mode 100644
index 31cb9fe6ec1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/plugin.xml
+++ /dev/null
@@ -1,976 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="org.eclipse.papyrus.infra.nattable.axismanager" name="Axis Manager" schema="schema/org.eclipse.papyrus.infra.nattable.axismanager.exsd"/>

-   <extension-point id="org.eclipse.papyrus.infra.nattable.cellmanager" name="Cell Manager" schema="schema/org.eclipse.papyrus.infra.nattable.cellmanager.exsd"/>

-   <extension-point id="org.eclipse.papyrus.infra.nattable.celleditor.configuration" name="CellEditorConfiguration" schema="schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd"/>

-   <extension-point id="org.eclipse.papyrus.infra.nattable.configuration" name="Nattable Configuration" schema="schema/org.eclipse.papyrus.infra.nattable.configuration.exsd"/>

-   <extension-point id="org.eclipse.papyrus.infra.nattable.tester" name="Table Tester" schema="schema/org.eclipse.papyrus.infra.nattable.tester.exsd"/>

- <extension

-       point="org.eclipse.ui.menus">

-    <menuContribution

-          allPopups="true"

-          locationURI="popup:org.eclipse.ui.popup.any">

-       <command

-             commandId="org.eclipse.papyrus.infra.nattable.invert.axis"

-             style="toggle">

-          <visibleWhen>

-             <and>

-                <with

-                      variable="selection">

-                   <test

-                         forcePluginActivation="true"

-                         property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                         value="true">

-                   </test>

-                </with>

-                <with

-                      variable="selection">

-                   <test

-                         forcePluginActivation="true"

-                         property="org.eclipse.papyrus.infra.nattable.tester.canInvertAxis"

-                         value="true">

-                   </test>

-                </with>

-             </and>

-          </visibleWhen>

-       </command>

-       <command

-             commandId="org.eclipse.ui.file.print"

-             label="Print Table"

-             mnemonic="&amp;P"

-             style="push">

-          <visibleWhen>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </visibleWhen>

-       </command>

-       <command

-             commandId="org.eclipse.ui.edit.selectAll"

-             style="push">

-          <visibleWhen>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </visibleWhen>

-       </command>

-       <command

-             commandId="org.eclipse.papyrus.infra.nattable.exporttoXLScommand"

-             style="push">

-          <visibleWhen>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </visibleWhen>

-       </command>

-       <menu

-             icon="icons/tableColumnAction.gif"

-             label="Columns">

-          <visibleWhen>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </visibleWhen>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.createdestroycolumns"

-                label="Create/Destroy columns"

-                style="push"

-                tooltip="Open a dialog to choose the visible columns">

-             <visibleWhen

-                   checkEnabled="true">

-             </visibleWhen>

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.sort.columns.command"

-                icon="icons/sort_columns_by_name_A_to_Z.gif"

-                label="Sort Columns (A-&gt;Z)"

-                style="push">

-             <parameter

-                   name="org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"

-                   value="true">

-             </parameter>

-             <visibleWhen>

-                <with

-                      variable="selection">

-                   <test

-                         forcePluginActivation="true"

-                         property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                         value="true">

-                   </test>

-                </with>

-             </visibleWhen>

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.sort.columns.command"

-                icon="icons/sort_columns_by_name_Z_to_A.gif"

-                label="Sort Columns (Z-&gt;A)"

-                style="push">

-             <parameter

-                   name="org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"

-                   value="false">

-             </parameter>

-             <visibleWhen>

-                <with

-                      variable="selection">

-                   <test

-                         forcePluginActivation="true"

-                         property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                         value="true">

-                   </test>

-                </with>

-             </visibleWhen>

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.column.display.index"

-                style="toggle">

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.column.display.label"

-                style="toggle">

-          </command>

-          <menu

-                icon="icons/columnIndex.png"

-                label="Index Style">

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.index.style"

-                   label="Alphabetical"

-                   style="radio">

-                <parameter

-                      name="org.eclipse.ui.commands.radioStateParameter"

-                      value="ALPHABETIC">

-                </parameter>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.index.style"

-                   label="Numerical"

-                   style="radio">

-                <parameter

-                      name="org.eclipse.ui.commands.radioStateParameter"

-                      value="NUMERIC">

-                </parameter>

-             </command>

-          </menu>

-          <menu

-                icon="icons/label.png"

-                label="Label Style">

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.label.display.icon"

-                   label="Display Icon"

-                   style="toggle">

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.label.feature.display.isderived"

-                   label="Display IsDerived"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureColumnHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.label.feature.display.name"

-                   label="Display Name"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureColumnHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.label.feature.display.type"

-                   label="Display Type"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureColumnHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.label.feature.display.multiplicity"

-                   label="Display Multiplicity"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureColumnHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.column.label.display.label"

-                   label="Display Label"

-                   style="toggle">

-             </command>

-          </menu>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.column.disconnect.slave"

-                style="toggle">

-             <visibleWhen>

-                <with

-                      variable="selection">

-                   <test

-                         forcePluginActivation="true"

-                         property="org.eclipse.papyrus.infra.nattable.tester.hasSlaveRowAxisProvider"

-                         value="true">

-                   </test>

-                </with>

-             </visibleWhen>

-          </command>

-       </menu>

-      

-       <menu

-             icon="icons/tableRowAction.gif"

-             label="Rows">

-          <visibleWhen>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </visibleWhen>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.createdestroyrows"

-                label="Create/Destroy rows"

-                style="push"

-                tooltip="Open a dialog to choose the visible rows">

-             <visibleWhen

-                   checkEnabled="true">

-             </visibleWhen>

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.sort.rows.command"

-                icon="icons/sort_columns_by_name_A_to_Z.gif"

-                label="Sort Rows (A-&gt;Z)"

-                style="push">

-             <parameter

-                   name="org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"

-                   value="true">

-             </parameter>

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.sort.rows.command"

-                icon="icons/sort_columns_by_name_Z_to_A.gif"

-                label="Sort Rows (Z-&gt;A)"

-                style="push">

-             <parameter

-                   name="org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"

-                   value="false">

-             </parameter>

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.row.display.index"

-                style="toggle">

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.row.display.label"

-                style="toggle">

-          </command>

-          <menu

-                icon="icons/rowIndex.png"

-                label="Index Style">

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.index.style"

-                   label="Alphabetical"

-                   style="radio">

-                <parameter

-                      name="org.eclipse.ui.commands.radioStateParameter"

-                      value="ALPHABETIC">

-                </parameter>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.index.style"

-                   label="Numerical"

-                   style="radio">

-                <parameter

-                      name="org.eclipse.ui.commands.radioStateParameter"

-                      value="NUMERIC">

-                </parameter>

-             </command>

-          </menu>

-          <menu

-                icon="icons/label.png"

-                label="Label Style">

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.label.display.icon"

-                   label="Display Icon"

-                   style="toggle">

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.label.feature.display.isderived"

-                   label="Display IsDerived"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureRowHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.label.feature.display.name"

-                   label="Display Name"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureRowHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.label.feature.display.type"

-                   label="Display Type"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureRowHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.label.feature.display.multiplicity"

-                   label="Display Multiplicity"

-                   style="toggle">

-                <visibleWhen>

-                   <with

-                         variable="selection">

-                      <test

-                            forcePluginActivation="true"

-                            property="org.eclipse.papyrus.infra.nattable.tester.hasFeatureRowHeaderConfiguration"

-                            value="true">

-                      </test>

-                   </with>

-                </visibleWhen>

-             </command>

-             <command

-                   commandId="org.eclipse.papyrus.infra.nattable.row.label.display.label"

-                   label="Display Label"

-                   style="toggle">

-             </command>

-          </menu>

-          <command

-                commandId="org.eclipse.papyrus.infra.nattable.row.disconnect.slave"

-                style="toggle">

-             <visibleWhen

-                   checkEnabled="true">

-                <with

-                      variable="selection">

-                   <test

-                         forcePluginActivation="true"

-                         property="org.eclipse.papyrus.infra.nattable.tester.hasSlaveColumnAxisProvider"

-                         value="true">

-                   </test>

-                </with>

-             </visibleWhen>

-          </command>

-       </menu> 

-    </menuContribution>

-  </extension>

-   <extension

-       point="org.eclipse.ui.handlers">

-    <handler

-          class="org.eclipse.papyrus.infra.nattable.handler.PrintTableHandler"

-          commandId="org.eclipse.ui.file.print">

-       <activeWhen>

-          <and>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </and>

-       </activeWhen>

-    </handler>

-    <handler

-          class="org.eclipse.papyrus.infra.nattable.handler.SelectAllHandler"

-          commandId="org.eclipse.ui.edit.selectAll">

-       <activeWhen>

-          <and>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </and>

-       </activeWhen>

-    </handler>

-    <handler

-          class="org.eclipse.papyrus.infra.nattable.handler.ExportToXLSHandler"

-          commandId="org.eclipse.papyrus.infra.nattable.exporttoXLScommand">

-       <activeWhen>

-          <and>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </and>

-       </activeWhen>

-    </handler>

-          <handler

-          class="org.eclipse.papyrus.infra.nattable.copy.CopySelectionToClipboardAction"

-          commandId="org.eclipse.ui.edit.copy">

-       <activeWhen>

-          <and>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </and>

-       </activeWhen>

-    </handler>

- </extension>

- <extension

-       point="org.eclipse.core.expressions.propertyTesters">

-    <propertyTester

-          class="org.eclipse.papyrus.infra.nattable.utils.NattableWidgetPropertyTester"

-          id="org.eclipse.papyrus.infra.nattable.tester"

-          namespace="org.eclipse.papyrus.infra.nattable.tester"

-          properties="isNattableWidget, hasFeatureRowHeaderConfiguration, hasFeatureColumnHeaderConfiguration, hasSlaveRowAxisProvider, hasSlaveColumnAxisProvider, canInvertAxis"

-          type="org.eclipse.jface.viewers.IStructuredSelection">

-    </propertyTester>

- </extension>

- <extension

-       point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-    <context

-          description="Context for the headers of the table"

-          id="org.eclipse.papyrus.infra.nattable.header.labelprovider">

-    </context>

-    <context

-          description="Context for feature in the header of the axis"

-          id="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider">

-    </context>

-    <context

-          description="Context for the body of the table"

-          id="org.eclipse.papyrus.infra.nattable.body.labelprovider">

-    </context>

-    <context

-          description="the context to use to find the label provider used to display values in cells and headers"

-          id="org.eclipse.papyrus.infra.nattable.full.labelprovider">

-    </context>

-    <labelProvider

-          priority="2000"

-          provider="org.eclipse.papyrus.infra.nattable.provider.NattableTopLabelProvider">

-       <labelProviderContext

-             context="org.eclipse.papyrus.infra.nattable.full.labelprovider">

-       </labelProviderContext>

-    </labelProvider>

-    <labelProvider

-          priority="1600"

-          provider="org.eclipse.papyrus.infra.nattable.provider.IndexHeaderLabelProvider">

-       <labelProviderContext

-             context="org.eclipse.papyrus.infra.nattable.header.labelprovider">

-       </labelProviderContext>

-       <labelProviderContext

-             context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider">

-       </labelProviderContext>

-    </labelProvider>

-     <labelProvider

-            priority="1950"

-            provider="org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.body.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

- </extension>

- 

- <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">

-

-	<metamodel nsURI="http://www.eclipse.org/emf/2002/Ecore">

-

-	<!-- Generalizarion specific advices (remove inconsistent views when a Generalization is deleted -->		

-	<adviceBinding id="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper"

-		class="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"

-		inheritance="all" typeId="*">

-	</adviceBinding>

-		

-	</metamodel>

-</extension>

-	

-<!-- UML ElementType bindings to Papyrus shared IClientContext -->

-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">

-

-	<!-- Bindings declaration to shared IClientContext -->

-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">	

-		<elementType ref="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper"/>

-	</binding>

-		

-</extension>

-<extension

-      point="org.eclipse.ui.commands">

-   <category

-         description="This cateogy can be used for all Papyrus Nattable Widget commands"

-         id="org.eclipse.papyrus.infra.nattable.category"

-         name="Papyrus Nattable Widget Category">

-   </category>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Export Table to XLS"

-         id="org.eclipse.papyrus.infra.nattable.exporttoXLScommand"

-         name="Export Table to XLS Command">

-   </command>

-

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.SelectColumnsHandler"

-         description="Open a dialog to select the columns to display"

-         id="org.eclipse.papyrus.infra.nattable.createdestroycolumns"

-         name="Select the columns to Show">

-      </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.SelectRowsHandler"

-         description="Open a dialog to select the rows to display"

-         id="org.eclipse.papyrus.infra.nattable.createdestroyrows"

-         name="Select the rows to Show">

-   </command>

-

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.SortColumnsHandler"

-         id="org.eclipse.papyrus.infra.nattable.sort.columns.command"

-         name="Sort Columns Command">

-      <commandParameter

-            id="org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"

-            name="alphabetic_order"

-            optional="false">

-      </commandParameter>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.SortRowsHandler"

-         id="org.eclipse.papyrus.infra.nattable.sort.rows.command"

-         name="Sort Rows Command">

-      <commandParameter

-            id="org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"

-            name="alphabetic_order"

-            optional="false">

-      </commandParameter>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayIndexHeaderHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.display.index"

-         name="Display Column Index">

-       <state

-         class="org.eclipse.ui.handlers.RegistryToggleState:true"

-         id="org.eclipse.ui.commands.toggleState">

-   </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayLabelHeaderHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.display.label"

-         name="Display Column Label">

-           <state

-         class="org.eclipse.ui.handlers.RegistryToggleState:true"

-         id="org.eclipse.ui.commands.toggleState">

-   </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ChangeIndexColumnStyleHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.index.style"

-         name="Change Column Index Style">

-           <commandParameter

-         id="org.eclipse.ui.commands.radioStateParameter"

-         name="ColumnHeaderParameter"

-         optional="false">

-   </commandParameter>

-   <state

-         class="org.eclipse.ui.handlers.RadioState:Alphabetic"

-         id="org.eclipse.ui.commands.radioState">

-   </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayIndexHeaderHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.display.index"

-         name="Display Row Index">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState:true"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayLabelHeaderHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.display.label"

-         name="Display Row Label">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState:true"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ChangeIndexRowStyleHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.index.style"

-         name="Change Row Index Style">

-      <commandParameter

-            id="org.eclipse.ui.commands.radioStateParameter"

-            name="ColumnHeaderParameter"

-            optional="false">

-      </commandParameter>

-      <state

-            class="org.eclipse.ui.handlers.RadioState:Alphabetic"

-            id="org.eclipse.ui.commands.radioState">

-      </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowMasterDisconnectColumnSlaveHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.disconnect.slave"

-         name="Disconnect Column Axis">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState:true"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnMasterDisconnectRowSlaveHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.disconnect.slave"

-         name="Disconnect Rows Axis">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState:true"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.InvertAxisHandler"

-         description="This command allows to invert rows and columns"

-         id="org.eclipse.papyrus.infra.nattable.invert.axis"

-         name="Invert Axis">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState:true"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>
-</extension>

-<extension

-      point="org.eclipse.ui.commands">

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayLabelImageHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.label.display.icon"

-         name="Display Row Label Icon">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayLabeTextHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.label.display.label"

-         name="Display Row Label">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayLabelFeatureIsDerivedHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.label.feature.display.isderived"

-         name="Display Row Label Feature IsDerived">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayLabelFeatureTypeHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.label.feature.display.type"

-         name="Display Row Label Feature Type">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayLabelFeatureMultiplicityHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.label.feature.display.multiplicity"

-         name="Display Row Label Feature Multiplicity">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDisplayLabelFeatureNameHandler"

-         id="org.eclipse.papyrus.infra.nattable.row.label.feature.display.name"

-         name="Display Row Label Feature Name">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayLabelImageHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.label.display.icon"

-         name="Display Column Labe Icon">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayLabelFeatureIsDerivedHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.label.feature.display.isderived"

-         name="Display Column Label Feature IsDerived">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayLabelTextHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.label.display.label"

-         name="Display Column Label">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayLabelFeatureMultiplicityHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.label.feature.display.multiplicity"

-         name="Display Column Label Feature Multiplicity">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayLabelFeatureTypeHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.label.feature.display.type"

-         name="Display Column Label Feature Type">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.nattable.category"

-         defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDisplayLabelFeatureNameHandler"

-         id="org.eclipse.papyrus.infra.nattable.column.label.feature.display.name"

-         name="Display Column Label Feature Name">

-      <state

-            class="org.eclipse.ui.handlers.RegistryToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>
-</extension>

-<extension

-      point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-   <labelProvider

-         priority="10"

-         provider="org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider">

-   </labelProvider>
-</extension>

-  <extension

-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">

-      <metamodel

-            nsURI="http://www.eclipse.org/papyrus/nattable/model">

-         <adviceBinding

-               class="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"

-               id="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice"

-               inheritance="all"

-               typeId="*">

-         </adviceBinding>

-      </metamodel>

-   </extension>

-   <extension

-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">

-      <binding

-            context="org.eclipse.papyrus.infra.services.edit.TypeContext">

-         <elementType

-               ref="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice">

-         </elementType>

-      </binding>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.createdestroycolumns"

-            icon="icons/CreateDestroyColumn.gif">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.createdestroyrows"

-            icon="icons/CreateDestroyRow.gif">

-      </image>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <category

-            description="This category is used for all rows commands"

-            id="org.eclipse.papyrus.infra.nattable.rows.command.category"

-            name="NatTable Rows Catgerory">

-      </category>

-      <category

-            description="This category is used for all columns Commands"

-            id="org.eclipse.papyrus.infra.nattable.columns.command.category"

-            name="NatTable Columns Category">

-      </category>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.columns.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnEditAliasHeaderHandler"

-            description="Allows to Edit the name of the column header"

-            id="org.eclipse.papyrus.infra.nattable.edit.column.header"

-            name="Rename Header">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.rows.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowEditAliasHeaderHandler"

-            description="Allows to Edit the name of the row header"

-            id="org.eclipse.papyrus.infra.nattable.edit.row.header"

-            name="Rename Header">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.rows.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDestroyAxisHandler"

-            id="org.eclipse.papyrus.infra.nattable.destroy.row"

-            name="Destroy Row">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.rows.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowDestroyAxisElementHandler"

-            id="org.eclipse.papyrus.infra.nattable.destroy.row.element"

-            name="Destroy Row Element">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.columns.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDestroyAxisHandler"

-            id="org.eclipse.papyrus.infra.nattable.destroy.column"

-            name="Destroy Column">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.columns.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnDestroyAxisElementHandler"

-            id="org.eclipse.papyrus.infra.nattable.destroy.column.element"

-            name="Destroy Column Element">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.rows.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.RowAutoResizeHandler"

-            id="org.eclipse.papyrus.infra.nattable.autoresize.rows"

-            name="AutoResize Row">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.infra.nattable.columns.command.category"

-            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ColumnAutoResizeHandler"

-            id="org.eclipse.papyrus.infra.nattable.autoresize.columns"

-            name="AutoResize Column">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.edit.column.header"

-            icon="icons/rename.gif">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.edit.row.header"

-            icon="icons/rename.gif">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.destroy.column.element"

-            icon="icons/delete_obj.gif">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.destroy.row.element"

-            icon="icons/delete_obj.gif">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.destroy.row"

-            icon="icons/remove_row.gif">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.destroy.column"

-            icon="icons/remove_column.gif">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.autoresize.columns"

-            icon="icons/auto_resize_column.png">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.autoresize.rows"

-            icon="icons/auto_resize_row.png">

-      </image>

-   </extension>
-</plugin>

-

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.axismanager.exsd b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.axismanager.exsd
deleted file mode 100644
index dd4392fd03c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.axismanager.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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.axismanager" name="Axis Manager"/>

-      </appinfo>

-      <documentation>

-         An extension point to register java axis manager for the table

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="axisManager" minOccurs="1" maxOccurs="unbounded"/>

-         </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="axisManager">

-      <annotation>

-         <documentation>

-            This extension allows to register java classes to manage axis for the table. The axis manager are referenced by the Papyrus Table metamodel using a String id.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The id used to link the java class to the AxisManager defined in the Papyrus table metamodel

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="manager" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The Java class used to managed an Axis of the table. This class must implements IAxisManager, 

-but we advice to extends AbstractAxisManager.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.manager.table.IAxisManager"/>

-               </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="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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd
deleted file mode 100644
index 0683d205574..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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.celleditor.configuration" name="org.eclipse.papyrus.infra.nattable.celleditor.configuration"/>

-      </appinfo>

-      <documentation>

-         An extension point to register celleditor configuration. A configuration determines how to edit the cell

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="configuration" minOccurs="1" maxOccurs="unbounded"/>

-         </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="configuration">

-      <annotation>

-         <documentation>

-            This extension point allows to register configuration used for celleditor in the table

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The class providing cell editor configuration for one or several type.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.celleditor.configs.IAxisCellEditorConfiguration"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="order" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Several configuration can be used for the same type, so we use this attribute to sort them.

-more the order is small, more the configuration is prioritary

-               </documentation>

-            </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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.cellmanager.exsd b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.cellmanager.exsd
deleted file mode 100644
index 79d6920ea7e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.cellmanager.exsd
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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.cellmanager.exsd" name="Cell Manager"/>

-      </appinfo>

-      <documentation>

-         An extension point to register cell manager for the Papyrus table

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="cellManager" minOccurs="1" maxOccurs="unbounded"/>

-         </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="cellManager">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a unique id to identify this contribution

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="order" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Several manager can be used to manage the same kind* of cell, so we use this attribute to sort them.

-more the order is small, more the configuration is prioritary

-

-*the kind of the cell is given by the intersection between a row and a column

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="manager" type="string" use="required">

-            <annotation>

-               <documentation>

-                  A Cell Manager class used to manage cells in the table. We advice to extends AbstractCellManager

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.manager.table.ICellManager"/>

-               </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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.configuration.exsd b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.configuration.exsd
deleted file mode 100644
index 6aa249e6641..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.configuration.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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.configuration" name="Nattable Configuration"/>

-      </appinfo>

-      <documentation>

-         This extension point allows to contribute table configurations to a catalog. This catalog allows to reuse existing configuration in a editor, a property view, and so on.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="configuration"/>

-         </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="configuration">

-      <annotation>

-         <documentation>

-            The file must be an EMF Model, with only one root. This root must be a TableConfiguration and its extension must be &quot;.nattableconfiguration&quot;.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="file" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a file with the extension .nattableconfiguration

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </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>

-         one

-      </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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
deleted file mode 100644
index 5dd209ae581..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
deleted file mode 100644
index db654b72350..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * 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.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"; //$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)

-	 */

-	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)

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
deleted file mode 100644
index d786f0e84fc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************

- * 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;

-

-/**

- * 

- * Tghis 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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
deleted file mode 100644
index 59afcd9e25f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  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.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.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 = CrossReferenceAdapter.getCrossReferenceAdapter(objectToDestroy);

-		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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
deleted file mode 100644
index 71fd8a77bb3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
deleted file mode 100644
index 13e2d823895..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
deleted file mode 100644
index 616d5e8aec2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*****************************************************************************

- * 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 vl222926

- * 

- */

-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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
deleted file mode 100644
index 65fe8cd52e4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************

- * 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 {

-

-	public static final String CELL_LABEL = "cell_label"; //$NON-NLS-1$

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getConfigCellId()

-	 * 

-	 * @return

-	 */

-	public final String getConfigCellId() {

-		return getEditorId() + CELL_LABEL;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDataValidator(Table, Object)

-	 * 

-	 * @return

-	 *         <code>null</code>

-	 */

-	public IDataValidator getDataValidator(Table table, Object axisElement) {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorDescription()

-	 * 

-	 * @return

-	 */

-	public String getEditorDescription() {

-		return "No Existing Description";

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
deleted file mode 100644
index 903ca5df9ea..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
deleted file mode 100644
index e08a2e9e555..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*****************************************************************************

- * 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.List;

-import java.util.Map;

-import java.util.TreeMap;

-

-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.model.nattable.Table;

-

-/**

- * 

- * This class allows to load and get all registered CellEditorConfigurationFactory

- * 

- */

-public class CellEditorConfigurationFactory {

-

-	private Map<Integer, IAxisCellEditorConfiguration> registry;

-

-	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$

-

-	//	public static final String FACTORY_ID_ATTRIBUTE = "id"; //$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 CellEditorConfigurationFactory INSTANCE = new CellEditorConfigurationFactory();

-

-	/**

-	 * 

-	 * Constructor.

-	 * Initial the registry of the configuration factories

-	 */

-	private CellEditorConfigurationFactory() {

-		//to prevent instanciation

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		this.registry = new TreeMap<Integer, IAxisCellEditorConfiguration>();

-		for(final IConfigurationElement iConfigurationElement : configElements) {

-			//			final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

-			final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));

-			try {

-				final IAxisCellEditorConfiguration factory = (IAxisCellEditorConfiguration)iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);

-				//				factory.initFactory(id);

-

-				if(factory != null) {

-					this.registry.put(order, factory);

-				}

-			} catch (final CoreException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param configurationId

-	 *        the id of the factory

-	 * @return

-	 *         the cellEditorFactory declared on this id or <code>null</code> if not found

-	 */

-	public IAxisCellEditorConfiguration getCellEditorConfigruation(final String configurationId) {

-		assert configurationId != null;

-		for(final Integer order : this.registry.keySet()) {

-			final IAxisCellEditorConfiguration current = this.registry.get(order);

-			if(configurationId.equals(current.getEditorId())) {

-				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 IAxisCellEditorConfiguration getFirstCellEditorConfiguration(final Table table, final Object obj) {

-		final List<IAxisCellEditorConfiguration> factories = getCellEditorConfigurationFactories(table, obj);

-		if(!factories.isEmpty()) {

-			return factories.get(0);

-		}

-		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 list of the cell editor configuration which are able to manage this object

-	 */

-	public List<IAxisCellEditorConfiguration> getCellEditorConfigurationFactories(final Table table, final Object obj) {

-		final List<IAxisCellEditorConfiguration> factories = new ArrayList<IAxisCellEditorConfiguration>();

-		for(final IAxisCellEditorConfiguration current : this.registry.values()) {

-			if(current.handles(table, obj)) {

-				factories.add(current);

-			}

-		}

-		return factories;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
deleted file mode 100644
index fb36d642615..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************

- * 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 axisElement

-	 *        TODO

-	 * @param table

-	 *        TODO

-	 * @param provider

-	 *        the label provider to use

-	 * @return

-	 *         the display converter

-	 */

-	public IDisplayConverter getDisplayConvert(Object axisElement, Table table, final ILabelProvider provider);

-

-	/**

-	 * 

-	 * @param table

-	 *        TODO

-	 * @param axisElement

-	 *        TODO

-	 * @return

-	 *         the cell painter for the editor

-	 */

-	public ICellPainter getCellPainter(Table table, Object axisElement);

-

-	/**

-	 * 

-	 * @param table

-	 *        TODO

-	 * @param axisElement

-	 *        the edited element axis

-	 * @param elementProvider

-	 * @return

-	 */

-	public ICellEditor getICellEditor(Table table, Object axisElement, ITableAxisElementProvider elementProvider);

-

-

-	/**

-	 * 

-	 * @param table

-	 *        TODO

-	 * @param axisElement

-	 *        TODO

-	 * @return

-	 *         the display mode to use for the editor

-	 */

-	public String getDisplayMode(Table table, Object axisElement);

-

-	/**

-	 * 

-	 * @return

-	 *         the id of the editor

-	 */

-	//FIXME should be renamed into getEditorConfigId

-	public String getEditorId();

-

-	/**

-	 * 

-	 * @return

-	 *         the id to use to tag the cell

-	 */

-	public String getConfigCellId();//FIXME : shoudl be removed!

-

-	/**

-	 * the data validator

-	 * 

-	 * @param table

-	 *        TODO

-	 * @param axisElement

-	 *        TODO

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
deleted file mode 100644
index af85027c26a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************

- * 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

- * 

- */

-public interface IAxisEStructuralFeatureCellEditorConfiguration extends IAxisCellEditorConfiguration {

-

-	/**

-	 * 

-	 * @return

-	 *         the edited feature

-	 */

-	public Collection<EStructuralFeature> getEditedFeature();

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
deleted file mode 100644
index a5cd6eb57db..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.command;

-

-

-public class CommandIds {

-

-	private CommandIds() {

-		//to prevent instanciation

-	}

-

-

-	public static final String TOGGLE_STATE = "org.eclipse.ui.commands.toggleState"; //$NON-NLS-1$

-

-	public static final String RADIO_STATE = "org.eclipse.ui.commands.radioState"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_DISPLAY_INDEX_ID = "org.eclipse.papyrus.infra.nattable.column.display.index"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_DISPLAY_LABEL_ID = "org.eclipse.papyrus.infra.nattable.column.display.label"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_DISPLAY_INDEX_STYLE_ID = "org.eclipse.papyrus.infra.nattable.column.index.style"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_DISPLAY_INDEX_ID = "org.eclipse.papyrus.infra.nattable.row.display.index"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_DISPLAY_LABEL_ID = "org.eclipse.papyrus.infra.nattable.row.display.label"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_DISPLAY_INDEX_STYLE_ID = "org.eclipse.papyrus.infra.nattable.row.index.style"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_LABEL_DISPLAY_ICON = "org.eclipse.papyrus.infra.nattable.column.label.display.icon";

-

-	public static final String COMMAND_ROW_LABEL_DISPLAY_ICON = "org.eclipse.papyrus.infra.nattable.row.label.display.icon";

-

-	public static final String COMMAND_COLUMN_LABEL_DISPLAY_LABEL = "org.eclipse.papyrus.infra.nattable.column.label.display.label";

-

-	public static final String COMMAND_ROW_LABEL_DISPLAY_LABEL = "org.eclipse.papyrus.infra.nattable.row.label.display.label";

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_IS_DERIVED = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.isderived";

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_MULTIPLICITY = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.multiplicity";

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_TYPE = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.type";

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_IS_DERIVED = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.isderived";

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_MULTIPLICITY = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.multiplicity";

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_TYPE = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.type";

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_NAME = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.name";

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_NAME = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.name";

-

-	public static final String COMMAND_ROW_DISCONNECT_SLAVE = "org.eclipse.papyrus.infra.nattable.row.disconnect.slave";

-

-	public static final String COMMAND_COLUMN_DISCONNECT_SLAVE = "org.eclipse.papyrus.infra.nattable.column.disconnect.slave";

-

-	public static final String COMMAND_INVERT_AXIS = "org.eclipse.papyrus.infra.nattable.invert.axis";

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
deleted file mode 100644
index 29295119699..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************

- * 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() {

-

-			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

-	 */

-	public void configureRegistry(IConfigRegistry configRegistry) {

-		//nothing to do

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java
deleted file mode 100644
index fd780498ad9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************

- * 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

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Override of the paintCell() method

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

-import org.eclipse.nebula.widgets.nattable.resize.command.RowResizeCommand;

-import org.eclipse.nebula.widgets.nattable.style.CellStyleUtil;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.style.IStyle;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * Custom CellPainter to define the LabelProvider to use

- * 

- * @author Vincent Lorenzo

- * 

- */

-//FIXME : we should use the TextPainter itself, now with the GenericDisplayConverter, it should works fine

-public class CustomizedCellPainter extends TextPainter {

-

-	/**

-	 * 

-	 * Constructor. We're overriding it to always set word-wrapping for our cells.

-	 * 

-	 */

-	public CustomizedCellPainter() {

-		super(false, true);//with (true,true), automatic newLine when the text is too long to be displayed.

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.AbstractTextPainter#convertDataType(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	protected String convertDataType(final ILayerCell cell, final IConfigRegistry configRegistry) {

-		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

-		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);

-		String str = provider.getText(contextElement);

-		if(str == null) {

-			str = ""; //$NON-NLS-1$

-		}

-		return str;

-	}

-

-	/**

-	 * Overridden to show, additionally to the contents of a cell, a vertical arrow pointing down in case there are masked lines

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter#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 rectangle

-	 * @param configRegistry

-	 */

-	@Override

-	public void paintCell(ILayerCell cell, GC gc, Rectangle rectangle, IConfigRegistry configRegistry) {

-		super.paintCell(cell, gc, rectangle, configRegistry);

-		IStyle cellStyle = CellStyleUtil.getCellStyle(cell, configRegistry);

-		int fontHeight = gc.getFontMetrics().getHeight();

-		String text = convertDataType(cell, configRegistry);

-		text = getTextToDisplay(cell, gc, rectangle.width, text);

-

-		int numberOfNewLines = getNumberOfNewLines(text);

-		//we're extending the row height (only if word wrapping is enabled)

-		int contentHeight = (fontHeight * numberOfNewLines) + (spacing * 2);

-		int contentToCellDiff = (cell.getBounds().height - rectangle.height);

-

-		if(performRowResize(contentHeight, rectangle)) {

-			ILayer layer = cell.getLayer();

-			layer.doCommand(new RowResizeCommand(layer, cell.getRowPosition(), contentHeight + contentToCellDiff));

-		}

-		if(numberOfNewLines > 1) {

-

-			int yStartPos = rectangle.y + CellStyleUtil.getVerticalAlignmentPadding(cellStyle, rectangle, contentHeight);

-			String[] lines = text.split("\n"); //$NON-NLS-1$

-			for(String line : lines) {

-				int lineContentWidth = Math.min(getLengthFromCache(gc, line), rectangle.width);

-

-				Image im = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("org.eclipse.papyrus.infra.nattable", "/icons/arrow_down_end.png"); //$NON-NLS-1$ //$NON-NLS-2$

-				gc.drawText(line, rectangle.x + CellStyleUtil.getHorizontalAlignmentPadding(cellStyle, rectangle, lineContentWidth) + spacing, yStartPos + spacing, SWT.DRAW_TRANSPARENT | SWT.DRAW_DELIMITER);

-

-				//We test if, given the current cell size and text position, we should display the down pointing arrow.

-				if(contentHeight > rectangle.height && yStartPos + fontHeight > rectangle.height + rectangle.y) {

-					int yDownRowIcon = rectangle.y + rectangle.height - im.getBounds().height;

-					int xDownRowIcon = rectangle.x + rectangle.width - im.getBounds().width;

-					gc.drawImage(im, xDownRowIcon, yDownRowIcon);

-				}

-

-				//after every line calculate the y start pos new

-				yStartPos += fontHeight;

-			}

-		}

-

-

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
deleted file mode 100644
index 5e3c9aeb0e7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*****************************************************************************

- * 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 java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.accumulator.CustomRowOverrideLabelAccumulator;

-import org.eclipse.papyrus.infra.nattable.celleditor.config.CellEditorConfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-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.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-

-

-/**

- * 

- * The configuration for the edition of the table

- * 

- */

-public class EditConfiguration extends DefaultEditConfiguration {

-

-	/**

-	 * the list of the message already displayed

-	 */

-	private Collection<String> messagesAlreadyDisplayed = new ArrayList<String>();

-

-	@Override

-	public void configureRegistry(IConfigRegistry configRegistry) {

-		super.configureRegistry(configRegistry);

-		//we remove the default cell editor

-		configRegistry.unregisterConfigAttribute(EditConfigAttributes.CELL_EDITOR, DisplayMode.NORMAL, null);

-

-		INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-

-		final BodyLayerStack bodyLayerStack = modelManager.getBodyLayerStack();

-		final Table table = modelManager.getTable();

-		final CellEditorDeclaration editorDeclaration = modelManager.getTable().getTableConfiguration().getCellEditorDeclaration();

-		if(editorDeclaration.equals(CellEditorDeclaration.COLUMN)) {

-			if(table.isInvertAxis()) {

-				//we declared celleditor on row

-				final CustomRowOverrideLabelAccumulator accumulator = new CustomRowOverrideLabelAccumulator(bodyLayerStack);

-				declaredCellEditors(modelManager.getRowElementsList(), configRegistry, null, accumulator);

-				bodyLayerStack.setConfigLabelAccumulator(accumulator);

-			} else {

-				final ColumnOverrideLabelAccumulator accumulator = new ColumnOverrideLabelAccumulator(bodyLayerStack);

-				declaredCellEditors(modelManager.getColumnElementsList(), configRegistry, accumulator, null);

-				bodyLayerStack.setConfigLabelAccumulator(accumulator);

-			}

-		} else if(editorDeclaration.equals(CellEditorDeclaration.ROW)) {

-			if(table.isInvertAxis()) {

-				//we declared celleditor on column

-				final ColumnOverrideLabelAccumulator accumulator = new ColumnOverrideLabelAccumulator(bodyLayerStack);

-				declaredCellEditors(modelManager.getColumnElementsList(), configRegistry, accumulator, null);

-				bodyLayerStack.setConfigLabelAccumulator(accumulator);

-			} else {

-				final CustomRowOverrideLabelAccumulator accumulator = new CustomRowOverrideLabelAccumulator(bodyLayerStack);

-				declaredCellEditors(modelManager.getRowElementsList(), configRegistry, null, accumulator);

-				bodyLayerStack.setConfigLabelAccumulator(accumulator);

-			}

-		} else if(editorDeclaration.equals(CellEditorDeclaration.CELL)) {

-			//not yet supported

-			throw new UnsupportedOperationException(Messages.EditConfiguration_DeclarationNotYetSupported);

-		}

-

-

-	}

-

-	private void declaredCellEditors(final List<Object> elements, final IConfigRegistry configRegistry, final ColumnOverrideLabelAccumulator columnAccumulator, final CustomRowOverrideLabelAccumulator rowAccumulator) {

-		INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-		boolean declareOnColumn = columnAccumulator != null;

-		boolean declareOnRow = rowAccumulator != null;

-		assert declareOnColumn != declareOnRow;

-		final CellEditorConfigurationFactory factory = CellEditorConfigurationFactory.INSTANCE;

-		List<String> existingEditorIds = new ArrayList<String>();

-		for(int i = 0; i < elements.size(); i++) {

-			//FIXME : for containement feature : see oep.views.properties.

-			// example : create Usecase in a class from the property view : EcorePropertyEditorFactory create a popup to display available type 

-			//then EditionDialog to edit the created object

-			Object current = elements.get(i);

-			if(current instanceof IAxis) {

-				current = ((IAxis)current).getElement();

-			}

-			final Table table = modelManager.getTable();

-			final IAxisCellEditorConfiguration config = factory.getFirstCellEditorConfiguration(table, current);

-			if(config != null) {

-				final ICellEditor editor = config.getICellEditor(table, current, modelManager.getTableAxisElementProvider());

-				if(editor != null) {

-					final String editorId = config.getEditorId() + Integer.toString(i);

-					if(existingEditorIds.contains(editorId)) {

-						org.eclipse.papyrus.infra.nattable.Activator.log.warn("Several editor have the same id");

-					} else {

-						existingEditorIds.add(editorId);

-					}

-

-					final String cellId = editorId + "_cellId"; //$NON-NLS-1$

-

-					final ICellPainter painter = config.getCellPainter(table, current);

-					final String displayMode = config.getDisplayMode(table, current);

-					final IDisplayConverter converter = config.getDisplayConvert(current, table, new EMFLabelProvider());//FIXME : label provider + arg order

-

-					final IDataValidator validator = config.getDataValidator(table, current);

-					assert !cellId.equals(editorId);

-					if(declareOnColumn) {

-						columnAccumulator.registerColumnOverrides(i, editorId, cellId);

-					} else {

-						rowAccumulator.registerRowOverrides(i, editorId, cellId);

-					}

-					if(painter != null) {

-						configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, painter, displayMode, cellId);

-					}

-					configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, displayMode, editorId);

-

-					if(converter != null) {

-						configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, converter, displayMode, cellId);

-					}

-

-					if(validator != null) {

-						configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR, validator, displayMode, cellId);

-					}

-				} else {

-					final String errorMessage = NLS.bind(Messages.EditConfiguration_FactoryHandlesElementButDoesntProvideEditor, config.getEditorId(), current);

-					if(!this.messagesAlreadyDisplayed.contains(errorMessage)) {

-						Activator.log.warn(errorMessage);

-						this.messagesAlreadyDisplayed.add(errorMessage);

-					}

-

-				}

-			} else {

-				final String errorMessage = NLS.bind(Messages.EditConfiguration_ConfigurationNotFound, current);

-				if(!this.messagesAlreadyDisplayed.contains(errorMessage)) {

-					Activator.log.warn(errorMessage);

-					this.messagesAlreadyDisplayed.add(errorMessage);

-				}

-			}

-		}

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
deleted file mode 100644
index 93ed611bb84..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************

- * 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;

-

-/**

- * 

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java
deleted file mode 100644
index b1ca4412e61..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.grid.layer.config.DefaultGridLayerConfiguration;

-import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;

-

-/**

- * We change the edit configuration

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class PapyrusGridLayerConfiguration extends DefaultGridLayerConfiguration {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param gridLayer

-	 */

-	public PapyrusGridLayerConfiguration(CompositeLayer gridLayer) {

-		super(gridLayer);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.grid.layer.config.DefaultGridLayerConfiguration#addEditingHandlerConfig()

-	 * 

-	 */

-	@Override

-	protected void addEditingHandlerConfig() {

-		addConfiguration(new EditConfiguration());

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
deleted file mode 100644
index ec447728d31..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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 vl222926

- * 

- */

-public class PapyrusHeaderMenuConfiguration extends AbstractUiBindingConfiguration {

-

-	/**

-	 * the category used for the column command

-	 */

-	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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
deleted file mode 100644
index d377ea0c755..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import java.util.Collection;

-import java.util.Collections;

-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.common.NotDefinedException;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.tools.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.Menu;

-import org.eclipse.swt.widgets.MenuItem;

-

-/**

- * PopupAction for Papyrus -> The contents of the popup is builded for each right click and not builded only one time as in NatTable

- * 

- * @author vl222926

- * 

- */

-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

-	 */

-	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, event.data);

-		menu.setData(event.data);

-		menu.setVisible(true);

-	}

-

-	/**

-	 * 

-	 * @param popupMenu

-	 * @param eventData

-	 */

-	private void buildMenu(final Menu popupMenu, final Object eventData) {

-		final Collection<Command> commands = EclipseCommandUtils.getAllExistingCommandsInCategory(category);

-

-		//FIXME : we should use the EclipseContext to transfert the eventData from here to the handler, but currently we can't have dependency on e4 plugins

-		//		final IEclipseContext eclipseContext = (IEclipseContext)PlatformUI.getWorkbench().getService(IEclipseContext.class);

-		//		eclipseContext.set(AbstractTableHandler.NAT_EVENT_DATA_PARAMETER_ID, eventData);

-

-		for(final Command command : commands) {

-			final IHandler handler = command.getHandler();

-			if(handler == null || !(handler instanceof AbstractHandler)) {

-				continue;

-			}

-			//FIXME : 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) {

-				MenuItem item = new MenuItem(popupMenu, SWT.PUSH);

-				item.setEnabled(true);

-				item.setImage(EclipseCommandUtils.getCommandIcon(command).createImage());

-				try {

-					item.setText(command.getName());

-				} catch (NotDefinedException e) {

-					Activator.log.error(e);

-				}

-				item.addSelectionListener(new SelectionListener() {

-

-					@Override

-					public void widgetSelected(SelectionEvent e) {

-						try {

-							//FIXME : we must be able to give the SelectionEvent to the handler using EclispeContext

-							Map<Object, Object> parameters = Collections.emptyMap();

-							handler.execute(new ExecutionEvent(command, parameters, null, null));

-						} catch (ExecutionException e1) {

-							Activator.log.error(e1);

-						}

-					}

-

-					@Override

-					public void widgetDefaultSelected(SelectionEvent e) {

-						//nothing do to

-					}

-				});

-			}

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
deleted file mode 100644
index 14f1daa1b59..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************

- * 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.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;

-

-/**

- * 

- * 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 BeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));

-		super.configureRegistry(configRegistry);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
deleted file mode 100644
index 29b424b44c2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************

- * 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;

-

-/**

- * Register a specific Cellpainter

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class StyleConfiguration extends DefaultNatTableStyleConfiguration {

-

-	@Override

-	public void configureRegistry(final IConfigRegistry configRegistry) {

-		super.configureRegistry(configRegistry);

-		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter());

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
deleted file mode 100644
index aa0f9e322f4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.converter;

-

-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.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-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 {

-

-	/**

-	 * throw new UnsupportedOperationException();

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(java.lang.Object)

-	 * 

-	 * @param canonicalValue

-	 * @return

-	 */

-	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

-	 */

-	public Object displayToCanonicalValue(Object displayValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * 

-	 * @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

-	 */

-	public Object canonicalToDisplayValue(ILayerCell cell, IConfigRegistry configRegistry, Object canonicalValue) {

-		LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

-		assert labelProvider != null;

-		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

-	 */

-	public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {

-		//		throw new UnsupportedOperationException();

-		return displayValue;

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
deleted file mode 100644
index fa98199ba7b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		INattableModelManager manager = getCurrentNattableModelManager();

-		((AbstractNattableWidgetManager)manager).copyToClipboard();

-		return null;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
deleted file mode 100644
index 01396dcd661..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * 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

-	 */

-	public int getColumnCount() {

-		return this.manager.getColumnCount();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getRowCount()

-	 * 

-	 * @return

-	 */

-	public int getRowCount() {

-		return this.manager.getRowCount();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 * 

-	 */

-	public void dispose() {

-		this.manager = null;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
deleted file mode 100644
index 0ded58331ae..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.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) {//FIXME : 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) {

-		switch(this.style) {

-		case ALPHABETIC:

-			return IntegerAndSpreadsheetNumberConverter.toString(axisIndex + 1);

-		case NUMERIC:

-			return axisIndex;

-		}

-		return null;

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
deleted file mode 100644
index d3c87aec785..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************

- * 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 vl222926

- * 

- */

-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

-	 */

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		IDataProvider provider = this.manager.getBodyDataProvider();

-		return provider.getDataValue(columnIndex, rowIndex);

-	}

-

-	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {

-		this.manager.setDataValue(columnIndex, rowIndex, newValue);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
deleted file mode 100644
index c7ace9a9810..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************

- * 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.

- * 

- * 

- */

-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.

-	 */

-	public Object getDataValue(final int columnIndex, final int rowIndex) {

-		switch(this.rowCount) {

-		case 0:

-			return null;

-		case 1:

-			if(this.displayFilter) {

-				return null;//FIXME 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 {

-				//FIXME 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) {

-					//FIXME not tested

-				}

-			}

-			break;

-		}

-		return null;

-	}

-

-	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.getColumnAbstractHeaderAxisUsedInTable(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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowHeaderDataProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowHeaderDataProvider.java
deleted file mode 100644
index e1d733ba457..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowHeaderDataProvider.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * 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:
- *     Original authors and others - 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 allows to manage the rows of the table. It provides
- * a row header with 0,1 or 2 columns
- * 
- */
-public class RowHeaderDataProvider extends AbstractHeaderDataProvider {
-
-	private int axisCount;
-
-	/**
-	 * 
-	 * Constructor.
-	 * 
-	 * @param manager
-	 *        the table manager
-	 */
-	public RowHeaderDataProvider(final INattableModelManager manager) {
-		super(manager);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getColumnCount()
-	 * 
-	 * @return
-	 * 
-	 */
-	@Override
-	public int getColumnCount() {
-		return this.axisCount;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)
-	 * 
-	 * @param columnIndex
-	 * @param rowIndex
-	 * @return
-	 */
-	public Object getDataValue(final int columnIndex, final int rowIndex) {
-		switch(this.axisCount) {
-		case 0:
-			return null;
-		case 1:
-			if(this.displayFilter) {
-				return null;//FIXME not tested
-			} else if(this.displayIndex) {
-				return getAxisIndex(rowIndex);
-			} else if(this.displayLabel) {
-				return this.manager.getRowElement(rowIndex);
-			}
-		case 2:
-			if(!this.displayFilter) {
-				if(columnIndex == 0) {
-					return getAxisIndex(rowIndex);
-				}
-				if(columnIndex == 1) {
-					return this.manager.getRowElement(rowIndex);
-				}
-			} else {
-				//FIXME not tested
-			}
-			break;
-		case 3:
-			if(!this.displayFilter) {
-				if(columnIndex == 0) {
-					return getAxisIndex(rowIndex);
-				}
-				if(columnIndex == 1) {
-					return this.manager.getRowElement(rowIndex);
-				}
-				if(columnIndex == 2) {
-					//FIXME not tested
-				}
-			}
-			break;
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
-	 * 
-	 * @param columnIndex
-	 * @param rowIndex
-	 * @param newValue
-	 */
-	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.getAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#updateAxisCount()
-	 * 
-	 */
-	@Override
-	protected void updateAxisCount() {
-		int newAxisCOunt = 0;
-		if(this.displayFilter) {
-			//newAxisCOunt++; //we ignore this value for rows headers
-		}
-		if(this.displayIndex) {
-			newAxisCOunt++;
-		}
-		if(this.displayLabel) {
-			newAxisCOunt++;
-		}
-		this.axisCount = newAxisCOunt;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
deleted file mode 100644
index 72391a24b7e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dialog;

-

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialogWithCheckBox;

-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 vl222926

- * 

- */

-public class DisplayedAxisSelectorDialog extends MultipleValueSelectorDialogWithCheckBox {

-

-	/**

-	 * 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(displayCheckBox && !isChecked) {

-			mustContinue = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), informationDialogTitle, informationDialogMessage);

-		}

-		if(mustContinue) {

-			super.okPressed();

-		}

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/ExportFormatter.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/ExportFormatter.java
deleted file mode 100644
index cf2f15df3b9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/ExportFormatter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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 ExportFormatter 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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java
deleted file mode 100644
index 92bc377a3c2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.Command;

-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.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-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.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Abstract class to edit the header cofniguration

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractChangeHeaderConfigurationHandler extends AbstractTableHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 * 

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		AbstractHeaderAxisConfiguration configuration = getEditedAxisConfiguration();

-		final CompositeCommand cmd = new CompositeCommand("ChangeHeaderConfigurationCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = (TransactionalEditingDomain)getTableEditingDomain();

-		if(configuration instanceof TableHeaderAxisConfiguration) {

-			//we can't edit it, because it's comes from the initial configuration

-			configuration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration)configuration);

-			final Table table = getCurrentNattableModelManager().getTable();

-			final IEditCommandRequest request = new SetRequest(domain, table, getLocalHeaderAxisConfigurationFeature(), configuration);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			cmd.add(provider.getEditCommand(request));

-		}

-		Command command = event.getCommand();

-		boolean oldValue = HandlerUtil.toggleCommandState(command);

-		final IEditCommandRequest request = new SetRequest(domain, configuration, getEditedFeature(), !oldValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);

-		cmd.add(provider.getEditCommand(request));

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 * 

-	 */

-	protected abstract EStructuralFeature getLocalHeaderAxisConfigurationFeature();

-

-	/**

-	 * 

-	 * @return

-	 *         the edited feature

-	 */

-	protected abstract EStructuralFeature getEditedFeature();

-

-	/**

-	 * 

-	 * @return

-	 *         the edited axis configuration

-	 */

-	protected abstract AbstractHeaderAxisConfiguration getEditedAxisConfiguration();

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java
deleted file mode 100644
index dde3cf17fa6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-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.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.commands.wrappers.GMFtoEMFCommandWrapper;

-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.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.handlers.RadioState;

-

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractChangeIndexStyleHandler extends AbstractTableHandler {

-

-	/**

-	 * 

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final AbstractHeaderAxisConfiguration configuration = getAxisConfiguration();

-

-		if(HandlerUtil.matchesRadioState(event)) {

-			return null; // we are already in the updated state - do nothing

-		}

-		String currentState = event.getParameter(RadioState.PARAMETER_ID);

-

-		TransactionalEditingDomain domain = (TransactionalEditingDomain)getTableEditingDomain();

-		AxisIndexStyle newStyle = AxisIndexStyle.get(currentState);

-		final IEditCommandRequest request = new SetRequest(domain, configuration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle(), newStyle);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);

-		final ICommand cmd = provider.getEditCommand(request);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-

-		// and finally update the current state

-		HandlerUtil.updateRadioState(event.getCommand(), currentState);

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the axis configuration to edit

-	 */

-	protected abstract AbstractHeaderAxisConfiguration getAxisConfiguration();

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java
deleted file mode 100644
index f5488c9a93f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.Command;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-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.commands.wrappers.GMFtoEMFCommandWrapper;

-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.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.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Abstract class used to change label configuration

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractChangeLabelConfigurationValueHandler extends AbstractTableHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 * 

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final CompositeCommand cmd = new CompositeCommand("ChangeLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = (TransactionalEditingDomain)getTableEditingDomain();

-		ILabelProviderConfiguration labelConf = getLabelProviderConfiguration();

-		ILabelProviderConfiguration editedLabelConf;

-		if(labelConf.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(labelConf);

-			cmd.add(getRegisterLocalLabelConfigurationCommand(labelConf, editedLabelConf));

-		} else {

-			editedLabelConf = labelConf;

-		}

-		Command command = event.getCommand();

-		boolean oldValue = HandlerUtil.toggleCommandState(command);

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, getEditedFeature(), !oldValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the edited label configuration

-	 */

-	protected abstract ILabelProviderConfiguration getLabelProviderConfiguration();

-

-	/**

-	 * 

-	 * @return

-	 *         the edited feature

-	 */

-	protected abstract EStructuralFeature getEditedFeature();

-

-	/**

-	 * 

-	 * @param conf

-	 * 

-	 */

-	protected ICommand getRegisterLocalLabelConfigurationCommand(ILabelProviderConfiguration tableLabelConfiguration, ILabelProviderConfiguration localTableLabelConfiguration) {

-		TransactionalEditingDomain domain = (TransactionalEditingDomain)getTableEditingDomain();

-		final CompositeCommand cmd = new CompositeCommand("ChangeHeaderLabelConfigurationCommand"); //$NON-NLS-1$

-		final Table table = getCurrentNattableModelManager().getTable();

-

-		//1. we must get or create the required LocalTableHeaderAxisConfiguration

-		AbstractHeaderAxisConfiguration configuration = getHeaderAxisConfiguration();

-		LocalTableHeaderAxisConfiguration localConfig = null;

-		if(configuration instanceof LocalTableHeaderAxisConfiguration) {

-			localConfig = (LocalTableHeaderAxisConfiguration)configuration;

-		} else if(configuration instanceof TableHeaderAxisConfiguration) {

-			//we can't edit it, because it's comes from the initial configuration

-			configuration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration)configuration);

-			localConfig = (LocalTableHeaderAxisConfiguration)configuration;

-			final IEditCommandRequest request = new SetRequest(domain, table, getLocalHeaderAxisConfigurationFeature(), configuration);

-			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, configuration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);

-		cmd.add(provider.getEditCommand(request));

-

-		//3. we must get or create the AxisManagerConfiguration(s)

-		final TableHeaderAxisConfiguration headerAxisConfig = getTableHeaderAxisConfiguration();

-

-		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();

-		for(final AxisManagerRepresentation current : headerAxisConfig.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;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the feature to use to edit the local header axis configuration

-	 */

-	protected abstract EStructuralFeature getLocalHeaderAxisConfigurationFeature();

-

-	/**

-	 * 

-	 * @return

-	 *         the edited axis configuration

-	 */

-	protected abstract AbstractHeaderAxisConfiguration getHeaderAxisConfiguration();

-

-	/**

-	 * 

-	 * @return

-	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration

-	 */

-	protected abstract TableHeaderAxisConfiguration getTableHeaderAxisConfiguration();

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
deleted file mode 100644
index ae1a6ee03c7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.getColumnAbstractHeaderAxisUsedInTable(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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
deleted file mode 100644
index 2abbce920f3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.getColumnAbstractHeaderAxisUsedInTable(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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java
deleted file mode 100644
index 215e1e52642..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-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.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.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-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.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Abstract handler used to change the value of the property IMasterAxisProvider#disconnectSlave

- * 

- * @author vl222926

- * 

- */

-public abstract class AbstractDisconnectSlaveHandler 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 AbstractAxisProvider axisProvider = getAxisProviderToEdit();

-		if(axisProvider instanceof MasterObjectAxisProvider) {

-			boolean newState = !HandlerUtil.toggleCommandState(event.getCommand());

-			final TransactionalEditingDomain domain = (TransactionalEditingDomain)getTableEditingDomain();

-			final IEditCommandRequest request = new SetRequest(domain, axisProvider, NattableaxisproviderPackage.eINSTANCE.getIMasterAxisProvider_DisconnectSlave(), newState);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(axisProvider);

-			final ICommand cmd = provider.getEditCommand(request);

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the axis provider to edit

-	 */

-	protected abstract AbstractAxisProvider getAxisProviderToEdit();

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		setBaseEnabled(getAxisProviderToEdit() instanceof MasterObjectAxisProvider);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
deleted file mode 100644
index 069e61acd12..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.getAbstractHeaderAxisConfigurationUsedInTable(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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
deleted file mode 100644
index a1917a8bc25..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java
deleted file mode 100644
index 1ab42467f20..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*****************************************************************************

- * 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 java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.expressions.IEvaluationContext;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-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.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * The abstract handler to use for the table actions

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractTableHandler extends AbstractHandler {

-

-	/** the id used to find the NatEvent in the EclipseContext */

-	public static final String NAT_EVENT_DATA_PARAMETER_ID = "natEventParameterId";

-

-	/**

-	 * the event which have declenched the call to setEnable(Object evaluationContext. This event contains the location of the mouse pointer when

-	 * the popup menu for this handler have been created

-	 */

-	//FIXME : should maybe be remove with the future usage of e4 and the Eclispe Context

-	protected NatEventData eventData;

-

-

-	/**

-	 * 

-	 * @return

-	 *         the current active part

-	 */

-	protected IWorkbenchPart getActivePart() {

-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current table manager or <code>null</code> if not found

-	 */

-	protected INattableModelManager getCurrentNattableModelManager() {

-		final IWorkbenchPart currentPart = getActivePart();

-		if(currentPart != null) {

-			final INattableModelManager manager = (INattableModelManager)currentPart.getAdapter(INattableModelManager.class);

-			return manager;

-		}

-		return null;

-	}

-

-

-	/**

-	 * Returns the EditingDomain associated to the table

-	 * 

-	 * @return

-	 */

-	protected EditingDomain getTableEditingDomain() {//duplicated code from NattableModelManager

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getCurrentNattableModelManager().getTable());

-			return registry.getService(EditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the context

-	 * 

-	 * @return

-	 */

-	protected EditingDomain getContextEditingDomain() {//duplicated code from NattableModelManager

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getCurrentNattableModelManager().getTable());

-			return registry.getService(EditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param evaluationContext

-	 *        the evaluation context

-	 * @return

-	 *         the NatEventData from this evaluation context

-	 */

-	protected NatEventData getNatEventData(final Object evaluationContext) {

-		if(evaluationContext instanceof NatEventData) {

-			return (NatEventData)evaluationContext;

-		}

-		NatEventData eventData = null;

-		if(evaluationContext instanceof IEvaluationContext) {

-			Object value = ((IEvaluationContext)evaluationContext).getVariable(NAT_EVENT_DATA_PARAMETER_ID);

-			if(value instanceof NatEventData) {

-				eventData = (NatEventData)value;

-			}

-		}

-		//FIXME : currently we can't have dependency on org.eclipse.e4.... 

-		//that's why we can't add the variable NAT_EVENT_DATA_PARAMETER_ID and we need to create a NatEventData instead of to get it in evaluationContext

-		if(eventData == null) {

-			Point cursorLocation = Display.getDefault().getCursorLocation();

-			Control control = Display.getDefault().getCursorControl();

-			if(control instanceof NatTable) {//FIXME : not nice, but required

-				cursorLocation = control.toControl(cursorLocation);

-				Event e = new Event();

-				e.x = cursorLocation.x;

-				e.y = cursorLocation.y;

-				e.display = Display.getDefault();

-				e.widget = control;

-				MouseEvent event = new MouseEvent(e);

-				eventData = NatEventData.createInstanceFromEvent(event);

-			}

-		}

-		return eventData;

-	}

-

-	/**

-	 * 

-	 * @param evaluationContext

-	 * @return

-	 *         the index of the rows which are fully selected

-	 */

-	protected List<Integer> getFullSelectedRowsIndex(Object evaluationContext) {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			final NatEventData data = getNatEventData(evaluationContext);

-			if(data != null) {

-				final SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-				int[] fullSelectedColumnsPosition = layer.getFullySelectedRowPositions();

-				List<Integer> positions = new ArrayList<Integer>();

-				for(int i : fullSelectedColumnsPosition) {

-					positions.add(layer.getRowIndexByPosition(i));

-				}

-				return positions;

-			}

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * 

-	 * @param evaluationContext

-	 * @return

-	 *         the index of the columns which are fully selected

-	 */

-	protected List<Integer> getFullSelectedColumnsIndex(Object evaluationContext) {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			final NatEventData data = getNatEventData(evaluationContext);

-			if(data != null) {

-				final SelectionLayer layer = manager.getBodyLayerStack().getSelectionLayer();

-				int[] fullSelectedColumnsPosition = layer.getFullySelectedColumnPositions();

-				List<Integer> positions = new ArrayList<Integer>();

-				for(int i : fullSelectedColumnsPosition) {

-					positions.add(layer.getColumnIndexByPosition(i));

-				}

-				return positions;

-			}

-		}

-		return Collections.emptyList();

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the row axis manager

-	 */

-	protected IAxisManager getRowAxisManager() {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			return manager.getRowAxisManager();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the column axis manager

-	 */

-	protected IAxisManager getColumnAxisManager() {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			return manager.getColumnAxisManager();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		this.eventData = getNatEventData(evaluationContext);

-		setBaseEnabled(getCurrentNattableModelManager() != null);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexColumnStyleHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexColumnStyleHandler.java
deleted file mode 100644
index b5c64308220..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexColumnStyleHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- * the handler used to change the index style of the column

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class ChangeIndexColumnStyleHandler extends AbstractChangeIndexStyleHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeIndexStyleHandler#getAxisConfiguration()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(getCurrentNattableModelManager().getTable());

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexRowStyleHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexRowStyleHandler.java
deleted file mode 100644
index 43bde668b45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexRowStyleHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-

-/**

- * the handler used to change the index style of the column

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class ChangeIndexRowStyleHandler extends AbstractChangeIndexStyleHandler {

-

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(getCurrentNattableModelManager().getTable());

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
deleted file mode 100644
index bb76fed59e0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.util.GCFactory;

-

-/**

- * Handler to resize columns

- * 

- * @author VL222926

- * 

- */

-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 {

-		final NatTable natTable = this.eventData.getNatTable();

-		natTable.doCommand(new InitializeAutoResizeColumnsCommand(natTable, this.eventData.getColumnPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));

-		return null;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
deleted file mode 100644
index db2a5de40cf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the elements represented by the selected columns

- * 

- * @author VL222926

- * 

- */

-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 {

-		final IAxisManager axisManager = getColumnAxisManager();

-		if(axisManager != null) {

-			axisManager.destroyAxisElement(getFullSelectedColumnsIndex(this.eventData));

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		final IAxisManager axisManager = getColumnAxisManager();

-		if(axisManager != null) {

-			this.eventData = getNatEventData(evaluationContext);

-			final List<Integer> col = getFullSelectedColumnsIndex(this.eventData);

-			setBaseEnabled(axisManager.canDestroyAxisElement(col));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
deleted file mode 100644
index 039e0d90d62..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the selected columns

- * 

- * @author VL222926

- * 

- */

-public class ColumnDestroyAxisHandler extends AbstractTableHandler {

-

-	/**

-	 * @Override

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 * 

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final IAxisManager axisManager = getColumnAxisManager();

-		if(axisManager != null) {

-			axisManager.destroyAxis(getFullSelectedColumnsIndex(this.eventData));

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		final IAxisManager axisManager = getColumnAxisManager();

-		if(axisManager != null) {

-			this.eventData = getNatEventData(evaluationContext);

-			final List<Integer> col = getFullSelectedColumnsIndex(this.eventData);

-			setBaseEnabled(axisManager.canDestroyAxis(col));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
deleted file mode 100644
index 688687030ca..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
deleted file mode 100644
index 7d3380de7bb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
deleted file mode 100644
index f7e5f767787..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
deleted file mode 100644
index 64e4a5f51cf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
deleted file mode 100644
index 36c01f4cff4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
deleted file mode 100644
index 34f1869cdc5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
deleted file mode 100644
index 9b7cc1b05dc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
deleted file mode 100644
index f8587b9fd40..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
deleted file mode 100644
index ad5123cc8b5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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;

-

-//FIXME : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2

-

-public class ColumnEditAliasHeaderHandler extends AbstractTableHandler {

-

-	//FIXME : this attribute must be removed when we introduce the dependency on e4.

-	private NatEventData eventData;

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		if(this.eventData != null) {

-			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager)getCurrentNattableModelManager();

-			manager.openEditColumnAliasDialog(this.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

-		final NatEventData eventData = getNatEventData(evaluationContext);

-		this.eventData = eventData;

-		final NattableModelManager manager = (NattableModelManager)getCurrentNattableModelManager();

-		if(eventData != null && manager != null) {

-			setBaseEnabled(manager.canEditColumnHeader(eventData));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
deleted file mode 100644
index f6bb5abc124..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-

-/**

- * 

- * @author vl222926

- * 

- */

-public class ColumnMasterDisconnectRowSlaveHandler extends AbstractDisconnectSlaveHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()

-	 * 

-	 * @return

-	 */

-	protected AbstractAxisProvider getAxisProviderToEdit() {

-		return AxisUtils.getAxisProviderUsedForColumns(getCurrentNattableModelManager());

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
deleted file mode 100644
index 5fc206bf76a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************

- * 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 {

-

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			manager.exportToXLS();

-		}

-		return null;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
deleted file mode 100644
index 279ebbed901..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-

-/**

- * The handler for the invert axis action

- * 

- * @author vl222926

- * 

- */

-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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
deleted file mode 100644
index 71a93b210b9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************

- * 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

-	 */

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			manager.print();

-		}

-		return null;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
deleted file mode 100644
index a8410990dbf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.util.GCFactory;

-

-/**

- * Handler used to resize rows

- * 

- * @author VL222926

- * 

- */

-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 {

-		final NatTable natTable = this.eventData.getNatTable();

-		natTable.doCommand(new InitializeAutoResizeRowsCommand(natTable, this.eventData.getRowPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));

-		return null;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
deleted file mode 100644
index 412372eb5c6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the element represented by the selected rows

- * 

- * @author VL222926

- * 

- */

-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();

-		if(axisManager != null) {

-			axisManager.destroyAxisElement(getFullSelectedRowsIndex(this.eventData));

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		final IAxisManager axisManager = getRowAxisManager();

-		if(axisManager != null) {

-			this.eventData = getNatEventData(evaluationContext);

-			final List<Integer> col = getFullSelectedRowsIndex(this.eventData);

-			setBaseEnabled(axisManager.canDestroyAxisElement(col));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
deleted file mode 100644
index d8be0b721ef..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the element represented by the selected rows

- * 

- * @author VL222926

- * 

- */

-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();

-		if(axisManager != null) {

-			axisManager.destroyAxis(getFullSelectedRowsIndex(this.eventData));

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		final IAxisManager axisManager = getRowAxisManager();

-		if(axisManager != null) {

-			this.eventData = getNatEventData(evaluationContext);

-			final List<Integer> rows = getFullSelectedRowsIndex(this.eventData);

-			setBaseEnabled(axisManager.canDestroyAxis(rows));

-		}

-		super.setBaseEnabled(false);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
deleted file mode 100644
index 90d6ecfafa7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
deleted file mode 100644
index 651291bac86..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
deleted file mode 100644
index 6932a7635bf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
deleted file mode 100644
index 040b102eee3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
deleted file mode 100644
index 484860e0cf7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
deleted file mode 100644
index d04c70da14d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
deleted file mode 100644
index 79c36a1a805..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
deleted file mode 100644
index ee8a66d8c20..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
deleted file mode 100644
index 0e91f69a74b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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;

-

-//FIXME : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2

-

-public class RowEditAliasHeaderHandler extends AbstractTableHandler {

-

-	//FIXME : this attribute must be removed when we introduce the dependency on e4.

-	private NatEventData eventData;

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		if(this.eventData != null) {

-			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager)getCurrentNattableModelManager();

-			manager.openEditRowAliasDialog(this.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

-		final NatEventData eventData = getNatEventData(evaluationContext);

-		this.eventData = eventData;

-		final NattableModelManager manager = (NattableModelManager)getCurrentNattableModelManager();

-		if(eventData != null && manager != null) {

-			setBaseEnabled(manager.canEditRowHeader(eventData));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
deleted file mode 100644
index cdac44637b7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-

-/**

- * 

- * @author vl222926

- * 

- */

-public class RowMasterDisconnectColumnSlaveHandler extends AbstractDisconnectSlaveHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()

-	 * 

-	 * @return

-	 */

-	protected AbstractAxisProvider getAxisProviderToEdit() {

-		return AxisUtils.getAxisProviderUsedForRows(getCurrentNattableModelManager());

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
deleted file mode 100644
index 8f91be66414..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************

- * 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 vl222926

- * 

- */

-public class SelectAllHandler extends AbstractTableHandler {

-

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			manager.selectAll();

-		}

-		return null;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
deleted file mode 100644
index cc2b7fdd7d5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  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

-	 */

-	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) {

-		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		setBaseEnabled(currentNattableModelManager.canCreateDestroyColumnsAxis());

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
deleted file mode 100644
index ff0afee70c9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  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

-	 */

-	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) {

-		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		setBaseEnabled(currentNattableModelManager.canCreateDestroyRowsAxis());

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
deleted file mode 100644
index 48d313cce0f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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

-	 */

-	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) {

-		INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			setBaseEnabled(manager.canMoveColumns());

-		}

-		setBaseEnabled(false);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
deleted file mode 100644
index 0ff9f6b4c71..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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

-	 */

-	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) {

-		INattableModelManager manager = getCurrentNattableModelManager();

-		if(manager != null) {

-			setBaseEnabled(manager.canMoveColumns());

-		}

-		super.setBaseEnabled(false);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
deleted file mode 100644
index 2dab02f944a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.helper.advice;

-

-

-public class DestroyTableAdviceHelper {

-

-	public DestroyTableAdviceHelper() {

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
deleted file mode 100644
index 663b1e5c4ca..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * 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.helper.advice;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.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.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * 

- * 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);

-		Set<EObject> elementsToDestroy = adapter.getInverseReferencers(eobject, NattableaxisPackage.eINSTANCE.getEObjectAxis_Element(), NattableaxisPackage.eINSTANCE.getEObjectAxis());

-		return new ArrayList<EObject>(elementsToDestroy);

-	}

-

-	//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(EObject element) {

-

-		CrossReferenceAdapter crossReferenceAdapter = CrossReferenceAdapter.getExistingCrossReferenceAdapter(element);

-		if(crossReferenceAdapter == null) {

-			TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(element);

-			if(domain != null) {

-				crossReferenceAdapter = CrossReferenceAdapter.getCrossReferenceAdapter(domain.getResourceSet());

-			}

-		}

-

-		return crossReferenceAdapter;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusGridLayer.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusGridLayer.java
deleted file mode 100644
index f0dc17d9864..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusGridLayer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.layer;

-

-import org.eclipse.nebula.widgets.nattable.grid.layer.GridLayer;

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusGridLayerConfiguration;

-

-/**

- * This grid layer ovverride the default edition behavior

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class PapyrusGridLayer extends GridLayer {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param bodyLayer

-	 * @param columnHeaderLayer

-	 * @param rowHeaderLayer

-	 * @param cornerLayer

-	 */

-	public PapyrusGridLayer(ILayer bodyLayer, ILayer columnHeaderLayer, ILayer rowHeaderLayer, ILayer cornerLayer) {

-		super(bodyLayer, columnHeaderLayer, rowHeaderLayer, cornerLayer);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param bodyLayer

-	 * @param columnHeaderLayer

-	 * @param rowHeaderLayer

-	 * @param cornerLayer

-	 * @param useDefaultConfiguration

-	 */

-	public PapyrusGridLayer(ILayer bodyLayer, ILayer columnHeaderLayer, ILayer rowHeaderLayer, ILayer cornerLayer, boolean useDefaultConfiguration) {

-		super(bodyLayer, columnHeaderLayer, rowHeaderLayer, cornerLayer, useDefaultConfiguration);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param useDefaultConfiguration

-	 */

-	public PapyrusGridLayer(boolean useDefaultConfiguration) {

-		super(useDefaultConfiguration);

-	}

-

-	@Override

-	protected void init(boolean useDefaultConfiguration) {

-		registerCommandHandlers();

-

-		if(useDefaultConfiguration) {

-			addConfiguration(new PapyrusGridLayerConfiguration(this));

-		}

-	}

-

-

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
deleted file mode 100644
index 4430248894b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************************

- * 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.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.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.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.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.reorder.CustomDefaultColumnReorderBindings;

-import org.eclipse.swt.SWT;

-

-

-

-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 RowReorderLayer rowReoderLayer;

-

-	public BodyLayerStack(final IDataProvider dataProvider, final INattableModelManager manager) {

-		this.bodyDataLayer = new DataLayer(dataProvider);

-		this.bodyDataLayer.addConfiguration(new StyleConfiguration());

-		this.bodyDataLayer.setDefaultColumnWidth(200);

-

-		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.selectionLayer = new SelectionLayer(this.columnHideShowLayer);

-		//		CopyDataCommandHandler handler = new CopyDataCommandHandler(this.selectionLayer);

-		////		handler.setCopyFormattedText(true);//to do the paste using the label provider

-		//		this.selectionLayer.registerCommandHandler(handler);

-

-		this.viewportLayer = new ViewportLayer(this.selectionLayer);

-		setUnderlyingLayer(this.viewportLayer);

-		setRegionName(GridRegion.BODY);

-	}

-

-

-	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;

-	}

-

-	@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 RowReorderLayer getRowReoderLayer() {

-	//		return this.rowReoderLayer;

-	//	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/ColumnHeaderLayerStack.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/ColumnHeaderLayerStack.java
deleted file mode 100644
index e26a8ff61a5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/ColumnHeaderLayerStack.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*****************************************************************************

- * 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.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.config.IConfiguration;

-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.ColumnHeaderLayer;

-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;

-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;

-import org.eclipse.nebula.widgets.nattable.print.command.TurnViewportOffCommand;

-import org.eclipse.nebula.widgets.nattable.print.command.TurnViewportOnCommand;

-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.nebula.widgets.nattable.viewport.ViewportLayer;

-import org.eclipse.nebula.widgets.nattable.viewport.action.ViewportSelectColumnAction;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusColumnHeaderStyleConfiguration;

-import org.eclipse.papyrus.infra.nattable.dataprovider.BodyDataProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.MouseEvent;

-

-

-public class ColumnHeaderLayerStack extends AbstractLayerTransform {

-

-	private final DataLayer dataLayer;

-

-	private final SelectionLayer selectionLayer;

-

-	private final ColumnHeaderLayer colHeaderLayer;

-

-	public ColumnHeaderLayerStack(final IDataProvider dataProvider, final BodyLayerStack bodyLayer, final BodyDataProvider bodyDataProvider) {

-		this.dataLayer = new DataLayer(dataProvider);

-		//		this.selectionLayer = null;//new SelectionLayer(this.dataLayer);

-		//FIXME : changes the data layer

-		//		ViewportLayer viewportLayer = new ViewportLayer(selectionLayer);

-

-		//		this.colHeaderLayer = new ColumnHeaderLayer(this.dataLayer, bodyLayer, this.selectionLayer);

-

-

-		final SelectionLayer selectionLayer = new SelectionLayer(new DataLayer(bodyDataProvider));

-		final ViewportLayer viewportLayer = new ViewportLayer(selectionLayer);

-		this.selectionLayer = bodyLayer.getSelectionLayer();

-		this.colHeaderLayer = new ColumnHeaderLayer(this.dataLayer, bodyLayer.getViewportLayer(), bodyLayer.getSelectionLayer());

-

-

-

-		final IConfiguration configuration = new CustomConfig();

-		//		setUnderlyingLayer(sortHeaderLayer);

-		this.colHeaderLayer.addConfiguration(new PapyrusColumnHeaderStyleConfiguration());

-		//		this.colHeaderLayer.addConfiguration(configuration);

-		setUnderlyingLayer(this.colHeaderLayer);

-		setRegionName(GridRegion.COLUMN_HEADER);

-	}

-

-	public DataLayer getDataLayer() {

-		return this.dataLayer;

-	}

-

-	@Override

-	public void configure(final ConfigRegistry configRegistry, final UiBindingRegistry uiBindingRegistry) {

-		super.configure(configRegistry, uiBindingRegistry);

-	}

-

-	public class CustomConfig extends DefaultSelectionBindings {

-

-		@Override

-		protected void configureColumnHeaderMouseClickBindings(final UiBindingRegistry uiBindingRegistry) {

-			//edit sur double click

-			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new MouseEditAction());

-			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new CustomSelectionViewPortAction(false, false));

-			//			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new SelectCellAction());

-

-			//			new BodyCellEditorMouseEventMatcher(TextCellEditor.class),

-			//			new MouseEditAction());

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new ViewportSelectColumnAction(false, false));

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.SHIFT), new ViewportSelectColumnAction(true, false));

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.CONTROL), new ViewportSelectColumnAction(false, true));

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.SHIFT | SWT.CONTROL), new ViewportSelectColumnAction(true, true));

-		}

-	}

-

-	public SelectionLayer getSelectionLayer() {

-		return this.selectionLayer;

-	}

-

-	public class CustomSelectionViewPortAction extends ViewportSelectColumnAction {

-

-		public CustomSelectionViewPortAction(final boolean withShiftMask, final boolean withControlMask) {

-			super(withShiftMask, withControlMask);

-			// TODO Auto-generated constructor stub

-		}

-

-		@Override

-		public void run(final NatTable natTable, final MouseEvent event) {

-			final int xPos = ColumnHeaderLayerStack.this.dataLayer.getColumnPositionByX(event.x);

-			final int yPos = ColumnHeaderLayerStack.this.dataLayer.getRowPositionByIndex(event.y);

-			//			System.out.println(xPos);

-			//			System.out.println(yPos);

-			final int xPos1 = ColumnHeaderLayerStack.this.colHeaderLayer.getColumnPositionByX(event.x);

-			final int yPos1 = ColumnHeaderLayerStack.this.colHeaderLayer.getRowPositionByY(event.y);

-			//			System.out.println(xPos1);

-			//			System.out.println(yPos2);

-			//natTable.doCommand(new ViewportSelectColumnAction(withShiftMask, withControlMask))

-			//			ColumnHeaderLayerStack.this.selectionLayer.selectColumn(yPos2, xPos1, false, false);

-

-			final int xPos2 = ColumnHeaderLayerStack.this.selectionLayer.getColumnPositionByX(event.x);

-			final int yPos2 = ColumnHeaderLayerStack.this.selectionLayer.getRowPositionByIndex(event.y);

-

-			natTable.doCommand(new TurnViewportOffCommand());

-			//			natTable.doCommand(new PrintCommand(natTable.getConfigRegistry(), natTable.getShell()));

-

-			ColumnHeaderLayerStack.this.selectionLayer.selectColumn(xPos1, yPos1, false, false);

-			natTable.doCommand(new TurnViewportOnCommand());

-			//			natTable.doCommand(new ViewportSelectColumnCommand(ColumnHeaderLayerStack.this.dataLayer, natTable.getColumnPositionByX(event.x), false, false));

-		}

-

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
deleted file mode 100644
index 834e15a429c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * 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.AbstractUiBindingConfiguration;

-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.AbstractLayerTransform;

-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;

-import org.eclipse.nebula.widgets.nattable.reorder.action.RowReorderDragMode;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings;

-import org.eclipse.nebula.widgets.nattable.ui.action.AggregateDragMode;

-import org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode;

-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.swt.SWT;

-

-

-public class RowHeaderLayerStack extends AbstractLayerTransform {

-

-	private static final int DEFAULT_COLUMN_WIDTH = 150;

-

-	private static final int DEFAULT_ROW_HEIGHT = 20;

-

-	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));

-

-		//ne marche pas! but : avoir le même type de cellule dans les headers des lignes et des colonnes

-		rowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());

-		//		final IConfiguration configuration = new CustomConfig();

-		//		setUnderlyingLayer(sortHeaderLayer);

-		//		rowHeaderLayer.addConfiguration(configuration);

-		//		rowHeaderLayer.addConfiguration(new RowOnlySelectionBindings());

-		setUnderlyingLayer(rowHeaderLayer);

-		setRegionName(GridRegion.ROW_HEADER);

-	}

-

-	public class CustomConfig extends DefaultSelectionBindings {

-

-

-

-		@Override

-		protected void configureRowHeaderMouseClickBindings(final UiBindingRegistry uiBindingRegistry) {

-

-			//			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new SelectCellAction());

-			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new MouseEditAction());

-			//			new BodyCellEditorMouseEventMatcher(TextCellEditor.class),

-			//			new MouseEditAction());

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new ViewportSelectColumnAction(false, false));

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.SHIFT), new ViewportSelectColumnAction(true, false));

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.CONTROL), new ViewportSelectColumnAction(false, true));

-			//			uiBindingRegistry.registerSingleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.SHIFT | SWT.CONTROL), new ViewportSelectColumnAction(true, true));

-		}

-	}

-

-	public class ReoderRowConfid extends AbstractUiBindingConfiguration {//This configuration should be added by the same kind of layer that DefaultColumnReorderLayerConfiguration but for row!

-

-		public void configureUiBindings(final UiBindingRegistry uiBindingRegistry) {

-			uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.rowHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CellDragMode(), new RowReorderDragMode()));

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
deleted file mode 100644
index cae313802c0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************

- * 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.listener;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-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;

-

-

-public class NatTableDropListener implements DropTargetListener {

-

-

-	private final INattableModelManager manager;

-

-	private LocationValue dropKindValue;

-

-	public NatTableDropListener(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	public void dragEnter(final DropTargetEvent event) {

-

-	}

-

-	public void dragLeave(final DropTargetEvent event) {

-

-	}

-

-	public void dragOperationChanged(final DropTargetEvent event) {

-

-	}

-

-	public void dragOver(final DropTargetEvent event) {

-		this.dropKindValue = null;

-		final LocalTransfer localTransfer = LocalTransfer.getInstance();

-		final Object data = localTransfer.nativeToJava(event.currentDataType);

-		IStructuredSelection structuredSelection = null;

-		if(data instanceof IStructuredSelection) {

-			structuredSelection = (IStructuredSelection)data;

-		}

-		final Collection<Object> objectsToAdd = Collections.checkedCollection(structuredSelection.toList(), Object.class);

-		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(objectsToAdd)) {

-				drop = DND.DROP_DEFAULT;

-			}

-			break;

-		case AFTER_ROW_HEADER:

-			if(this.manager.canDropRowElement(objectsToAdd)) {

-				drop = DND.DROP_DEFAULT;

-			}

-			break;

-		case COLUMN_HEADER:

-			if(this.manager.canInsertColumns(objectsToAdd, this.dropKindValue.getColumnIndex())) {

-				drop = DND.DROP_DEFAULT;

-			}

-			break;

-		case ROW_HEADER:

-			if(this.manager.canInsertRow(objectsToAdd, this.dropKindValue.getRowIndex())) {

-				drop = DND.DROP_DEFAULT;

-			}

-			break;

-		case CELL:

-			//FIXME

-			drop = DND.DROP_NONE;

-			break;

-		case UNKNOWN:

-			drop = DND.DROP_NONE;

-			break;

-		default:

-			drop = DND.DROP_NONE;

-			break;

-		}

-		event.detail = drop;

-	}

-

-	public void drop(final DropTargetEvent event) {

-		//we drop the elements into the table

-		LocalTransfer localTransfer = LocalTransfer.getInstance();

-		Object data = localTransfer.nativeToJava(event.currentDataType);

-		if(data instanceof StructuredSelection) {

-			final IStructuredSelection selection = (IStructuredSelection)data;

-			final List<Object> droppedElements = selection.toList();

-			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:

-				//FIXME

-				break;

-			case UNKNOWN:

-				break;

-			default:

-				break;

-			}

-		}

-		this.dropKindValue = null;

-	}

-

-

-	public void dropAccept(final DropTargetEvent event) {

-

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
deleted file mode 100644
index e1fd1dc7924..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-

-public abstract class AbstractAxisManager implements IAxisManager {

-

-	/**

-	 * the represented axis manager

-	 */

-	protected AxisManagerRepresentation representedAxisManager;

-

-	/**

-	 * the represented axis provider

-	 */

-	private AbstractAxisProvider representedContentProvider;

-

-	/**

-	 * the global manager for the table

-	 */

-	protected INattableModelManager tableManager;

-

-	/**

-	 * the listener on the axis

-	 */

-	protected Adapter axisListener;

-

-	/**

-	 * the context of the table. We need to keep it, to be able to remove listeners on it, when the table is destroying

-	 */

-	private EObject tableContext;

-

-	/**

-	 * 

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager,

-	 *      java.lang.String, org.eclipse.papyrus.infra.nattable.model.nattable.nattablecontentprovider.IAxisContentsProvider)

-	 * 

-	 * @param manager

-	 *        the globale table manager

-	 * @param provider

-	 *        the represented axis provider

-	 * @param managerId

-	 *        the id of this manager

-	 */

-	public void init(final INattableModelManager manager, final AxisManagerRepresentation rep, final AbstractAxisProvider provider) {

-		this.tableManager = manager;

-		this.representedAxisManager = rep;

-		this.representedContentProvider = provider;

-		this.tableContext = manager.getTable().getContext();

-		this.axisListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) {

-				getTableManager().updateAxisContents(getRepresentedContentProvider());

-			}

-		};

-		this.representedContentProvider.eAdapters().add(this.axisListener);

-

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getTableManager()

-	 * 

-	 * @return

-	 */

-	public NattableModelManager getTableManager() {

-		return (NattableModelManager)this.tableManager;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canInsertAxis(java.util.Collection, int)

-	 * 

-	 * @param objectsToAdd

-	 * @param index

-	 * @return

-	 */

-	public boolean canInsertAxis(Collection<Object> objectsToAdd, int index) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canCreateAxisElement(java.lang.String)

-	 * 

-	 * @param elementId

-	 * @return

-	 */

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDropAxisElement(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 * @return

-	 */

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 * 

-	 */

-	public void dispose() {

-		if(this.axisListener != null) {

-			this.representedContentProvider.eAdapters().remove(this.axisListener);

-			this.axisListener = null;

-		}

-		this.tableContext = null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeUsedAsRowManager()

-	 * 

-	 * @return

-	 */

-	public boolean canBeUsedAsRowManager() {

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeUsedAsColumnManager()

-	 * 

-	 * @return

-	 */

-	public boolean canBeUsedAsColumnManager() {

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	public Command getAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getInsertAxisCommand(java.util.Collection, int)

-	 * 

-	 * @param objectsToAdd

-	 * @param index

-	 * @return

-	 */

-	public Command getInsertAxisCommand(Collection<Object> objectsToAdd, int index) {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getComplementaryAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	public Command getComplementaryAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getRepresentedContentProvider()

-	 * 

-	 * @return

-	 */

-	public AbstractAxisProvider getRepresentedContentProvider() {

-		return this.representedContentProvider;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#setHeaderDataValue(int, int, java.lang.Object)

-	 * 

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	public void setHeaderDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		// nothing to do

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isAllowedContents(java.lang.Object)

-	 * 

-	 * @param object

-	 * @return <code>true</code> if the object is not yet represented by an axis

-	 */

-	public boolean isAllowedContents(Object object) {

-		return !getTableManager().getElementsList(getRepresentedContentProvider()).contains(object);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canMoveAxis()

-	 * 

-	 * @return

-	 */

-	public boolean canMoveAxis() {

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#createPossibleAxisContentProvider(boolean)

-	 * 

-	 * @param isRestricted

-	 * @return

-	 */

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-		return null;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToDestroy

-	 * @return

-	 */

-	public Command getDestroyAxisCommand(EditingDomain domain, Collection<Object> objectToDestroy) {

-		return null;

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the context of the managed table

-	 */

-	protected final EObject getTableContext() {

-		return this.tableContext;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 * 

-	 * @return

-	 */

-	public Collection<Object> getAllManagedAxis() {

-		Set<Object> eObjects = new HashSet<Object>();

-		for(final IAxis current : getRepresentedContentProvider().getAxis()) {

-			if(current.getManager() == this.representedAxisManager) {

-				eObjects.add(current.getElement());

-			}

-		}

-		return eObjects;

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the table

-	 * 

-	 * @return

-	 */

-	protected EditingDomain getTableEditingDomain() {//Duplicated from NatTableModelManager

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTableManager().getTable());

-			return registry.getService(EditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-

-		return null;

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the context

-	 * 

-	 * @return

-	 */

-	protected EditingDomain getContextEditingDomain() { //Duplicated from NatTableModelManager

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTableContext());

-			return registry.getService(TransactionalEditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-	}

-

-	public void moveAxis(Object elementToMove, int newIndex) {

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#openEditAxisAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData,

-	 *      int)

-	 * 

-	 * @param event

-	 * @param axisPosition

-	 */

-	@Override

-	public void openEditAxisAliasDialog(final NatEventData event, int axisPosition) {

-		final IAxis axis = this.representedContentProvider.getAxis().get(axisPosition);

-		String alias = axis.getAlias();

-		if(alias == null) {

-			alias = ""; //$NON-NLS-1$

-		}

-

-		final String dialogMessage = String.format(Messages.AbstractAxisManager_InputDialogMessage, getElementAxisName(axis));

-		Point location = new Point(event.getOriginalEvent().x, event.getOriginalEvent().y);

-		Control natTable = event.getNatTable();

-		location = natTable.toDisplay(location);

-		final InputDialog dialog = new InputDialogWithLocation(Display.getDefault().getActiveShell(), Messages.AbstractAxisManager_InputDialogTitle, dialogMessage, alias, null, location);

-		int result = dialog.open();

-		if(result == IDialogConstants.OK_ID) {

-			String newAlias = dialog.getText();

-			if("".equals(newAlias)) { //$NON-NLS-1$

-				newAlias = null;

-			}

-			final TransactionalEditingDomain domain = (TransactionalEditingDomain)getTableEditingDomain();

-			final SetRequest request = new SetRequest(domain, axis, NattableaxisPackage.eINSTANCE.getIAxis_Alias(), newAlias);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(axis);

-			final ICommand cmd = provider.getEditCommand(request);

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		}

-	}

-

-	/**

-	 * This method mustt be overriden by the children classes

-	 * 

-	 * @param axis

-	 *        an axis

-	 * @return

-	 *         <code>null</code> or an {@link UnsupportedOperationException} when the method {@link #canEditAxisHeader()} returns <code>false</code>

-	 */

-	public String getElementAxisName(final IAxis axis) {

-		if(canEditAxisHeader()) {

-			return null;

-		} else {

-			throw new UnsupportedOperationException();

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getAxisManagerRepresentation()

-	 * 

-	 * @return

-	 */

-	@Override

-	public AxisManagerRepresentation getAxisManagerRepresentation() {

-		return this.representedAxisManager;

-	}

-

-	/**

-	 * 

-	 * @param axisPositions

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxis(final List<Integer> axisPositions) {

-		if(axisPositions.isEmpty()) {

-			return false;

-		}

-		for(final Integer integer : axisPositions) {

-			if(!canDestroyAxis(integer)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	@Override

-	public boolean canDestroyAxisElement(List<Integer> axisPositions) {

-		if(axisPositions.isEmpty()) {

-			return false;

-		}

-		for(final Integer integer : axisPositions) {

-			if(!canDestroyAxisElement(integer)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @param axisPositions

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#destroyAxis(java.util.List)

-	 */

-	@Override

-	public void destroyAxis(final List<Integer> axisPositions) {

-		final List<Object> toDestroy = getElements(axisPositions);

-		EditingDomain domain = getTableEditingDomain();

-		final Command cmd = getDestroyAxisCommand(domain, toDestroy);

-		domain.getCommandStack().execute(cmd);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxis(java.lang.Integer)

-	 * 

-	 * @param axisPosition

-	 * @return

-	 */

-	public boolean canDestroyAxis(final Integer axisPosition) {

-		return !isDynamic();

-	}

-

-

-	/**

-	 * 

-	 * @param axisPositions

-	 *        axis positions

-	 * @return

-	 *         the elements located at these axis position

-	 */

-	protected List<Object> getElements(final List<Integer> axisPositions) {

-		final List<Object> elements = getElements();

-		for(final Integer position : axisPositions) {

-			final Object element = elements.get(position);

-			elements.add(element);

-		}

-		return elements;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#destroyAxisElement(java.util.List)

-	 * 

-	 * @param axisPosition

-	 */

-	@Override

-	public void destroyAxisElement(final List<Integer> axisPosition) {

-		final CompoundCommand cmd = new CompoundCommand("Destroy Axis Element Command");

-		EditingDomain domain = getContextEditingDomain();

-		for(Integer integer : axisPosition) {

-			cmd.append(getDestroyAxisElementCommand(domain, integer));

-		}

-

-		domain.getCommandStack().execute(cmd);

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the list owning the elements displayed on the managed axis

-	 */

-	protected List<Object> getElements() {

-		return this.tableManager.getElementsList(getRepresentedContentProvider());

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractSynchronizedOnFeatureAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractSynchronizedOnFeatureAxisManager.java
deleted file mode 100644
index d60c8b3905e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractSynchronizedOnFeatureAxisManager.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractSynchronizedOnFeatureAxisManager extends AbstractAxisManager {//FIXME : this abstract class must inherits from the UML Element axis manager

-

-	/**

-	 * the feature listener

-	 */

-	protected Adapter featureListener;

-

-	/**

-	 * the featuer currenlty listen

-	 */

-	protected EStructuralFeature currentListenFeature;

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider)

-	 * 

-	 * @param manager

-	 * @param provider

-	 * @param rep

-	 */

-	@Override

-	public void init(final INattableModelManager manager, final AxisManagerRepresentation rep, final AbstractAxisProvider provider) {

-		super.init(manager, rep, provider);

-		verifyValues();

-		this.currentListenFeature = getListenFeature();

-		addContextFeatureValueListener();

-	}

-

-	/**

-	 * add a listener on the table context to listen the required feature

-	 */

-	protected void addContextFeatureValueListener() {

-		this.featureListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if(msg.getFeature() == AbstractSynchronizedOnFeatureAxisManager.this.currentListenFeature) {//FIXME : create our own adapter for derived/subset feature

-					getTableManager().updateAxisContents(getRepresentedContentProvider());

-				}

-			};

-		};

-

-		getTableContext().eAdapters().add(this.featureListener);

-	}

-

-	/**

-	 * this method verify that the fields and the parameters are correct for this synchronized table

-	 * 

-	 */

-	protected void verifyValues() {

-		Assert.isNotNull(getFillingConfiguration() != null);

-		verifyCoupleContextFeature();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the feature to listen according to the current table configuration or <code>null</code> if it is not definedS

-	 */

-	protected EStructuralFeature getListenFeature() {

-		final EStructuralFeatureValueFillingConfiguration config = getFillingConfiguration();

-		if(config != null) {

-			return config.getListenFeature();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the filling configuration used by the table or <code>null</code> if any is defined

-	 */

-	protected EStructuralFeatureValueFillingConfiguration getFillingConfiguration() {//FIXME : local configuration not yet managed

-		for(final IAxisConfiguration current : this.representedAxisManager.getSpecificAxisConfigurations()) {

-			if(current instanceof EStructuralFeatureValueFillingConfiguration) {

-				return (EStructuralFeatureValueFillingConfiguration)current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		getTableContext().eAdapters().remove(this.featureListener);

-		super.dispose();

-	}

-

-	/**

-	 * verify that the context contains the feature

-	 * 

-	 */

-	protected void verifyCoupleContextFeature() {

-		final EStructuralFeature feature = getListenFeature();

-		if(feature != null) {

-			Assert.isTrue(feature.isMany());

-			Assert.isTrue(getTableManager().getTable().getContext().eClass().getEAllStructuralFeatures().contains(feature));

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canInsertAxis(java.util.Collection, int)

-	 * 

-	 * @param objectsToAdd

-	 * @param index

-	 * @return

-	 */

-	@Override

-	public boolean canInsertAxis(Collection<Object> objectsToAdd, int index) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Collection<Object> getAllManagedAxis() {

-		final EObject context = getTableContext();

-		Object value;

-		if(this.currentListenFeature != null) {

-			value = context.eGet(this.currentListenFeature);

-		} else {

-			value = context.eGet(getListenFeature());

-		}

-		assert value instanceof List<?>;

-		List<Object> interestingObject = filterObject((List<?>)value);

-		interestingObject = sortObjects(interestingObject);

-		return interestingObject;

-	}

-

-	/**

-	 * 

-	 * @param objects

-	 * @return

-	 */

-	protected List<Object> sortObjects(final Collection<Object> objects) {

-		return new ArrayList<Object>(objects);

-	}

-

-	/**

-	 * 

-	 * @param objects

-	 * @return

-	 */

-	protected List<Object> filterObject(final List<?> objects) {

-		return new ArrayList<Object>(objects);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canMoveAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canMoveAxis() {

-		return false;

-	}

-

-	public final boolean isDynamic() {

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 * 

-	 * @return

-	 */

-	public boolean isSlave() {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AxisManagerFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AxisManagerFactory.java
deleted file mode 100644
index 426a2c7609a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AxisManagerFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.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;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-

-/**

- * The axis manager factory

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class AxisManagerFactory {

-

-	private static final String CLASS_MANAGER = "manager"; //$NON-NLS-1$

-

-	private static final String CLASS_ID = "id"; //$NON-NLS-1$

-

-	private final Map<String, Class<IAxisManager>> map;

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.axismanager"; //$NON-NLS-1$

-

-	public static final AxisManagerFactory INSTANCE = new AxisManagerFactory();

-

-	private AxisManagerFactory() {

-		this.map = new HashMap<String, Class<IAxisManager>>();

-

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for(final IConfigurationElement iConfigurationElement : configElements) {

-			final String id = iConfigurationElement.getAttribute(CLASS_ID);

-			try {

-				//to avoid problem when the provided class in not this plugin!

-				IAxisManager axisManager = (IAxisManager)iConfigurationElement.createExecutableExtension(CLASS_MANAGER);

-				@SuppressWarnings("unchecked")

-				final Class<IAxisManager> myClass = (Class<IAxisManager>)axisManager.getClass();

-				this.map.put(id, myClass);

-			} catch (final CoreException e) {

-				Activator.log.error(String.format(Messages.AxisManagerFactory_AxisManagerClassCantBeLoaded, id), e);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param axisManagerRepresentation

-	 * @return

-	 *         the axis manager for this axisManagerRepresentation. The class calling this method must initialize itself the IAxisManager with its

-	 *         method #init

-	 */

-	public IAxisManager getAxisManager(final AxisManagerRepresentation axisManagerRepresentation) {

-		final Class<IAxisManager> managerClass = this.map.get(axisManagerRepresentation.getAxisManagerId());

-		IAxisManager axisManager = null;

-		if(managerClass != null) {

-			try {

-				axisManager = managerClass.newInstance();

-			} catch (final InstantiationException e) {

-				Activator.log.error(Messages.AxisManagerFactory_TheClassCantBeInstanciated, e);

-			} catch (final IllegalAccessException e) {

-				Activator.log.error(e);

-			}

-		}

-		return axisManager;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
deleted file mode 100644
index afe68fc069f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

-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.edit.command.MoveCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.utils.AxisComparator;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.widgets.providers.CompoundFilteredRestrictedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-

-

-public class CompositeAxisManager extends AbstractAxisManager implements ICompositeAxisManager {

-

-	/**

-	 * the id of this manager

-	 */

-	private static final String MANAGER_ID = "org.eclipse.papyrus.infra.nattable.composite.axis.manager"; //$NON-NLS-1$

-

-	/**

-	 * the sub managers

-	 */

-	protected List<IAxisManager> subManagers;

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setSubAxisManager(java.util.List)

-	 * 

-	 * @param managers

-	 */

-	public void setSubAxisManager(final List<IAxisManager> managers) {

-		this.subManagers = managers;

-		updateAxisContents();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		for(final IAxisManager current : this.subManagers) {

-			current.dispose();

-		}

-		this.subManagers.clear();

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsRowManager()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsRowManager() {

-		boolean answer = true;

-		final Iterator<IAxisManager> iter = this.subManagers.iterator();

-		while(iter.hasNext() && answer) {

-			answer = iter.next().canBeUsedAsRowManager();

-		}

-		return answer;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsColumnManager()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsColumnManager() {

-		boolean answer = true;

-		final Iterator<IAxisManager> iter = this.subManagers.iterator();

-		while(iter.hasNext() && answer) {

-			answer = iter.next().canBeUsedAsColumnManager();

-		}

-		return answer;

-	}

-

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		boolean canCreateAxisElement = false;

-		for(IAxisManager manager : subManagers) {

-			canCreateAxisElement |= manager.canCreateAxisElement(elementId);

-		}

-		return canCreateAxisElement;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);

-		for(final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getAddAxisCommand(domain, objectToAdd);

-			if(tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if(cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getComplementaryAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);

-		for(final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getComplementaryAddAxisCommand(domain, objectToAdd);

-			if(tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if(cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#updateAxisContents()

-	 * 

-	 */

-	public synchronized void updateAxisContents() {

-		final List<Object> displayedElement = getTableManager().getElementsList(getRepresentedContentProvider());

-		synchronized(displayedElement) {

-			displayedElement.clear();

-			displayedElement.addAll(getRepresentedContentProvider().getAxis());

-			if(this.subManagers != null) {

-				for(final IAxisManager current : this.subManagers) {

-					if(current.isDynamic()) {

-						displayedElement.addAll(current.getAllManagedAxis());

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)

-	 * 

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		for(final IAxisManager current : this.subManagers) {

-			if(current.isAllowedContents(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canMoveAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canMoveAxis() {

-		for(final IAxisManager current : this.subManagers) {

-			if(!current.canMoveAxis() || current.isDynamic()) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#sortAxisByName(boolean,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 * 

-	 * @param inverted

-	 * @param configRegistry

-	 */

-	public void sortAxisByName(boolean alphabeticOrder, final IConfigRegistry configRegistry) {

-		if(canMoveAxis()) {

-			final List<IAxis> axis = new ArrayList<IAxis>(getRepresentedContentProvider().getAxis());

-			Collections.sort(axis, new AxisComparator(alphabeticOrder, configRegistry));

-			final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(getRepresentedContentProvider());

-			final AbstractEditCommandRequest request = new SetRequest(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), axis);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());

-			final ICommand cmd = provider.getEditCommand(request);

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		}

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createPossibleAxisContentProvider(boolean)

-	 * 

-	 * @param isRestricted

-	 * @return a contents provider for this axis or <code>null</code> if it is not allowed

-	 */

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-

-		CompoundFilteredRestrictedContentProvider compoundContentProvider = null;

-		for(final IAxisManager current : this.subManagers) {

-			IRestrictedContentProvider contentProvider = current.createPossibleAxisContentProvider(isRestricted);

-			if(contentProvider != null) {

-				if(compoundContentProvider == null) {

-					compoundContentProvider = new CompoundFilteredRestrictedContentProvider();

-				}

-				compoundContentProvider.add(contentProvider);

-			}

-		}

-		return compoundContentProvider;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToDestroy

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisCommand(EditingDomain domain, Collection<Object> objectToDestroy) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_DestroyAxisCommand);

-		for(final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getDestroyAxisCommand(domain, objectToDestroy);

-			if(tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if(cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Collection<Object> getAllManagedAxis() {

-		Set<Object> allExistingAxis = new HashSet<Object>();

-		for(IAxisManager manager : this.subManagers) {

-			Collection<Object> managerPossibleElements = manager.getAllManagedAxis();

-			if(managerPossibleElements != null) {

-				allExistingAxis.addAll(managerPossibleElements);

-			}

-		}

-		return allExistingAxis;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 * 

-	 * @return

-	 *         <code>true</code> if one of the encapsulated manager is a slave

-	 */

-	public boolean isSlave() {

-		for(final IAxisManager manager : this.subManagers) {

-			if(manager.isSlave()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isDynamic()

-	 * 

-	 * @return

-	 *         <code>true</code> if one of the embedded axis manager is dynamic

-	 */

-	public boolean isDynamic() {

-		for(final IAxisManager manager : this.subManagers) {

-			if(manager.isDynamic()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		for(final IAxisManager current : this.subManagers) {

-			if(current.canDropAxisElement(objectsToAdd)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 * 

-	 * @param elementToMove

-	 * @param newIndex

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#moveAxis(java.lang.Object, int)

-	 */

-	public void moveAxis(Object elementToMove, int newIndex) {

-		if(!isDynamic() && elementToMove instanceof IAxis) {

-			EditingDomain domain = getTableEditingDomain();

-			final Command command = MoveCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), elementToMove, newIndex);

-			domain.getCommandStack().execute(command);

-		};

-	}

-

-	@Override

-	public boolean canEditAxisHeader(final NatEventData axisIndex) {

-		axisIndex.getColumnPosition();//FIXME

-		if(canEditAxisHeader()) {//FIXME

-			return true;

-		} else {

-			return false;//FIXME : we need to iterate on the contents to know if it is possible or not

-		}

-	}

-

-	@Override

-	public boolean canEditAxisHeader() {

-		for(final IAxisManager current : this.subManagers) {

-			if(!current.canEditAxisHeader()) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElementAxisName(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

-	 * 

-	 * @param axis

-	 * @return

-	 */

-	public String getElementAxisName(final IAxis axis) {

-		final AxisManagerRepresentation manager = axis.getManager();

-		for(final IAxisManager man : this.subManagers) {

-			if(man.getAxisManagerRepresentation() == manager) {

-				return man.getElementAxisName(axis);

-			}

-		}

-		if(canEditAxisHeader()) {

-			return null;

-		} else {

-			throw new UnsupportedOperationException();

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 *        an axis

-	 * @return

-	 *         the axis manager managing this axis

-	 */

-	protected IAxisManager getAxisManager(final IAxis axis) {

-		final AxisManagerRepresentation rep = axis.getManager();

-		for(final IAxisManager man : this.subManagers) {

-			if(man.getAxisManagerRepresentation() == rep) {

-				return man;

-			}

-		}

-		return null;//must be impossible

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDestroyAxis(java.lang.Integer)

-	 * 

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxis(final Integer axisPosition) {

-		final List<Object> elements = tableManager.getElementsList(getRepresentedContentProvider());//FIXME create a util method for that

-		final Object element = elements.get(axisPosition);

-		if(element instanceof IAxis) {

-			return getAxisManager((IAxis)element).canDestroyAxis(axisPosition);

-		}

-		//not yet managed

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 * 

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		final List<Object> elements = tableManager.getElementsList(getRepresentedContentProvider());//FIXME create a util method for that

-		final Object element = elements.get(axisPosition);

-		if(element instanceof IAxis) {

-			return getAxisManager((IAxis)element).canDestroyAxisElement(axisPosition);

-		} else if(subManagers.size() == 1) {

-			return subManagers.get(0).canDestroyAxisElement(axisPosition);

-		}

-		//not yet managed

-		return false;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Integer)

-	 * 

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		final List<Object> elements = tableManager.getElementsList(getRepresentedContentProvider());//FIXME create a util method for that

-		final Object element = elements.get(axisPosition);

-		if(element instanceof IAxis) {

-			return getAxisManager((IAxis)element).getDestroyAxisElementCommand(domain, axisPosition);

-		} else if(subManagers.size() == 1) {

-			return subManagers.get(0).getDestroyAxisElementCommand(domain, axisPosition);

-		}

-		//not yet managed

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManager.java
deleted file mode 100644
index 1643eb0e3ff..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManager.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.ui.services.IDisposable;

-

-/**

- * The common interface used by the axis manager

- * 

- * @author Vincent Lorenzo

- * 

- */

-public interface IAxisManager extends IDisposable {

-

-	/**

-	 * 

-	 * @return <code>true</code> if the manager can be used horizontally

-	 */

-	public boolean canBeUsedAsRowManager();

-

-	/**

-	 * 

-	 * @return <code>true</code> if the manager can be used vertically

-	 */

-	public boolean canBeUsedAsColumnManager();

-

-	/**

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param objectToAdd

-	 *        the object to add

-	 * @return the command to add an axis to the emf model

-	 */

-	public Command getAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd);

-

-	/**

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param objectToAdd

-	 *        the object to add

-	 * @return the complementary command, which is called by the master on the

-	 *         slave to add required axis

-	 */

-	public Command getComplementaryAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd);

-

-	/**

-	 * 

-	 * @param manager

-	 *        the table model manager

-	 * @param managerRep

-	 *        its axis manager representation

-	 * @param provider

-	 *        //FIXME : realy usefule?

-	 *        the managed axis provider

-	 */

-	public void init(final INattableModelManager manager, AxisManagerRepresentation managerRep, final AbstractAxisProvider provider);

-

-	public void setHeaderDataValue(int columnIndex, int rowIndex, Object newValue);

-

-	/**

-	 * 

-	 * @return

-	 *         the managed axis provider

-	 */

-	public AbstractAxisProvider getRepresentedContentProvider();

-

-	/**

-	 * 

-	 * 

-	 * @return

-	 *         the table manager using this axis manager

-	 */

-	public NattableModelManager getTableManager(); //FIXME : we must use an interface with a small set of accessible method... 

-

-

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if the contents provided by the axis manager is derived of the contents provided by the others axis manager

-	 */

-	public boolean isSlave();

-

-	public boolean canInsertAxis(Collection<Object> objectsToAdd, int index);

-

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd);

-

-	public Command getInsertAxisCommand(Collection<Object> objectsToAdd, int index);

-

-	/**

-	 * 

-	 * @param object

-	 *        an object

-	 * @return

-	 *         <code>true</code> if the object can be managed by the AxisManager

-	 */

-	public boolean isAllowedContents(final Object object);

-

-	/**

-	 * 

-	 * @return <code>true</code> if we can move elements on the axis

-	 */

-	public boolean canMoveAxis();

-

-	/**

-	 * 

-	 * @param isRestricted

-	 * @return

-	 *         a content provider or <code>null</code> if the dialog to add/destroy axis is not supported

-	 */

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted);

-

-

-	/**

-	 * 

-	 * @param domain

-	 * @param objectToDestroy

-	 * @return

-	 */

-	public Command getDestroyAxisCommand(EditingDomain domain, Collection<Object> objectToDestroy);

-

-	/**

-	 * 

-	 * @return

-	 *         the list of the existing axis managed by the axis manager

-	 */

-	public Collection<Object> getAllManagedAxis();

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if the contents provided by this axis manager is derived of the (UML) model

-	 */

-	public boolean isDynamic();

-

-	/**

-	 * 

-	 * @param newIndex

-	 * @param axisToMove

-	 */

-	public void moveAxis(final Object elementToMove, final int newIndex);

-

-	/**

-	 * 

-	 * @param elementId

-	 *        the id of the element to create

-	 * @return

-	 *         <code>true</code> if the element can be created

-	 */

-	public boolean canCreateAxisElement(final String elementId);

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if we allows to edit the string of all axis headers.

-	 */

-	public boolean canEditAxisHeader();

-

-	/**

-	 * Open a dialog to edit the alias of an axis and set the value

-	 * 

-	 * @param event

-	 *        the event

-	 * @param axisIndex

-	 *        the position of the axis

-	 */

-	public void openEditAxisAliasDialog(final NatEventData event, int axisIndex);

-

-	/**

-	 * 

-	 * @return

-	 *         the axis manager representation

-	 */

-	public AxisManagerRepresentation getAxisManagerRepresentation();

-

-	/**

-	 * 

-	 * @param axis

-	 *        an axis

-	 * @return

-	 *         the name used for this axis

-	 */

-	public String getElementAxisName(final IAxis axis);//FIXME pb if the axisManager returns Object and not IAxis... -> use the index!

-

-	/**

-	 * 

-	 * @param axisIndex

-	 *        axis index

-	 * @return

-	 *         <code>true</code> if ALL axis identified by the axisIndex can be destroyed

-	 */

-	public boolean canDestroyAxis(final List<Integer> axisIndex);

-

-	/**

-	 * 

-	 * @param axisIndex

-	 * @return

-	 *         <code>true</code> if the axis identified by the axisIndex can be destroyed

-	 */

-	public boolean canDestroyAxis(final Integer axisIndex);

-

-	/**

-	 * Destroy all axis represented by their index

-	 * 

-	 * @param axisIndex

-	 *        a list of axis index

-	 */

-	public void destroyAxis(final List<Integer> axisIndex);

-

-	/**

-	 * 

-	 * @param axisIndex

-	 *        a list of axis index

-	 * @return

-	 *         <code>true</code> if ALL elements represented by the axis located to these index can be destroyed

-	 */

-	public boolean canDestroyAxisElement(final List<Integer> axisIndex);

-

-	/**

-	 * 

-	 * @param axisIndex

-	 *        the index of an element

-	 * @return

-	 *         <code>true</code> if we can destroy the element represented by the axis located to this index

-	 */

-	public boolean canDestroyAxisElement(final Integer axisIndex);

-

-	/**

-	 * 

-	 * @param axisIndex

-	 *        the list of the index of the elements to destroy

-	 */

-	public void destroyAxisElement(final List<Integer> axisIndex);

-

-	/**

-	 * 

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	public Command getDestroyAxisElementCommand(final EditingDomain domain, final Integer axisPosition);

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java
deleted file mode 100644
index 829e8a67be0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-

-

-/**

- * 

- * This interfaces provides the methods for the CompositeAxisManager

- * 

- */

-public interface ICompositeAxisManager extends IAxisManager {

-

-	/**

-	 * 

-	 * @param subAxisManager

-	 *        the managed axis manager

-	 */

-	public void setSubAxisManager(final List<IAxisManager> subAxisManager);

-

-	/**

-	 * update the contents of the list representing the managed axis

-	 */

-	public void updateAxisContents();

-

-	/**

-	 * 

-	 * @param alpabeticOrder

-	 *        <code>true</code> if we sort the axis by alphabetic order, <code>false</code> if not

-	 * @param iConfigRegistry

-	 *        the config registry used to find the label provider

-	 */

-	public void sortAxisByName(final boolean alpabeticOrder, IConfigRegistry iConfigRegistry);

-

-	public boolean canEditAxisHeader(NatEventData evaluationContext);

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/InputDialogWithLocation.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/InputDialogWithLocation.java
deleted file mode 100644
index 21ab5b76034..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/InputDialogWithLocation.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * The developper can define the location of this input dialog

- * 

- * @author vl222926

- * 

- */

-public class InputDialogWithLocation extends InputDialog {

-

-	/**

-	 * the location wanted to display the dialog

-	 */

-	private Point location;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @see InputDialog#InputDialog(Shell, String, String, String, IInputValidator)

-	 * @param parentShell

-	 * @param title

-	 * @param label

-	 * @param initialValue

-	 * @param validator

-	 * @param dialogLocation

-	 *        the location to use for the dialog

-	 */

-	public InputDialogWithLocation(Shell parentShell, String title, String label, String initialValue, IInputValidator validator, final Point dialogLocation) {

-		super(parentShell, title, label, initialValue, validator);

-		this.location = dialogLocation;

-	}

-

-	@Override

-	public void create() {

-		super.create();

-		//adapted code from AbstractStyleEditorDialog in nattable plugin

-		if(location != null) {

-			if(location.x < getParentShell().getDisplay().getBounds().x) {

-				location.x = getParentShell().getDisplay().getBounds().x;

-			} else if(location.x + getShell().getBounds().width > getParentShell().getDisplay().getBounds().x + getParentShell().getDisplay().getBounds().width) {

-				location.x = getParentShell().getDisplay().getBounds().x + getParentShell().getDisplay().getBounds().width - getShell().getBounds().width;

-			}

-			if(location.y + getShell().getBounds().height > getParentShell().getDisplay().getBounds().y + getParentShell().getDisplay().getBounds().height) {

-				location.y = getParentShell().getDisplay().getBounds().y + getParentShell().getDisplay().getBounds().height - getShell().getBounds().height;

-			}

-		}

-		getShell().setLocation(location);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java
deleted file mode 100644
index edbc373e53e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.cell;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-/**

- * The abstract class for the cell manager

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractCellManager implements ICellManager {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#setValue(org.eclipse.emf.edit.domain.EditingDomain, java.lang.Object,

-	 *      java.lang.Object, java.lang.Object)

-	 * 

-	 * @param domain

-	 * @param obj1

-	 * @param obj2

-	 * @param newValue

-	 */

-	public void setValue(EditingDomain domain, Object obj1, Object obj2, Object newValue) {

-		final Command cmd = getSetValueCommand(domain, obj1, obj2, newValue);

-		assert cmd != null;

-		domain.getCommandStack().execute(cmd);

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/CellManagerFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/CellManagerFactory.java
deleted file mode 100644
index 57f3cc5422f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/CellManagerFactory.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************

- * 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.cell;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Map;

-import java.util.TreeMap;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-//FIXME : should implements ICrossValueSolver?

-public class CellManagerFactory {

-

-	public static final String CLASS_MANAGER = "manager"; //$NON-NLS-1$

-

-	public static final String ORDER = "order"; //$NON-NLS-1$

-

-	public static final String SOLVER_ID = "id"; //$NON-NLS-1$

-

-	//	private final Map<String, Class<IAxisManager>> map;

-

-	private final Collection<ICellManager> solvers;

-

-	private final Map<Integer, ICellManager> managersMap;

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.cellmanager"; //$NON-NLS-1$

-

-	public static final CellManagerFactory INSTANCE = new CellManagerFactory();

-

-	private CellManagerFactory() {

-		this.solvers = new ArrayList<ICellManager>();

-		this.managersMap = new TreeMap<Integer, ICellManager>();

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for(final IConfigurationElement iConfigurationElement : configElements) {

-

-			final String id = iConfigurationElement.getAttribute(SOLVER_ID);

-			final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER));

-			try {

-

-				//to avoid pb when the provided class in not this plugin!

-				final ICellManager solver = (ICellManager)iConfigurationElement.createExecutableExtension(CLASS_MANAGER);

-				this.managersMap.put(order, solver);

-				this.solvers.add(solver);

-			} catch (final CoreException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}

-		}

-	}

-

-	public Object getCrossValue(final Object obj1, final Object obj2) {

-		final ICellManager cellManager = getCrossValueSolver(obj1, obj2);

-		if(cellManager != null) {

-			return cellManager.getValue(obj1, obj2);

-		}

-		//FIXME should return a specific error or a message?

-		return null;

-	}

-

-	private ICellManager getCrossValueSolver(final Object obj1, final Object obj2) {

-		for(final Integer integer : this.managersMap.keySet()) {

-			ICellManager current = this.managersMap.get(integer);

-			//			for(final ICellManager current : this.solvers) {

-			if(current.handles(obj1, obj2)) {

-				return current;

-			}

-			//			}

-		}

-		//FIXME should return a specific error or a message?

-		return null;

-	}

-

-	public boolean isCellEditable(final Object obj1, final Object obj2) {

-		final ICellManager cellManager = getCrossValueSolver(obj1, obj2);

-		if(cellManager != null) {

-			return cellManager.isCellEditable(obj1, obj2);

-		}

-		return false;

-

-	}

-

-	public void setCellValue(final EditingDomain domain, final Object obj1, final Object obj2, final Object newValue) {

-		final ICellManager cellManager = getCrossValueSolver(obj1, obj2);

-		if(cellManager != null) {

-			cellManager.setValue(domain, obj1, obj2, newValue);

-		}

-	}

-

-	//	public ICellEditor getCellEditor (final Table table, final Object obj1, final Object obj2){

-	//		final ICellManager cellManager = getCrossValueSolver(obj1, obj2);

-	//		if(cellManager!=null){

-	//			return cellManager.getCellEditor(table, obj1);

-	//		}

-	//		return null;

-	//	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java
deleted file mode 100644
index c8b9e712e59..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************

- * 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.cell;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-

-/**

- * The interface to implements for a cell manager

- * 

- * @author Vincent Lorenzo

- * 

- */

-public interface ICellManager {

-

-	/**

-	 * The string displayed for Not_AVAILABLE

-	 */

-	public static final String NOT_AVALAIBLE = Messages.ICellManager_NotAvailable;

-

-

-	public boolean handles(final Object obj1, final Object obj2);//FIXME : add the table as parameter

-

-	public boolean handlesAxisElement(final Object obj);

-

-	/**

-	 * 

-	 * @param axisElement1

-	 *        one of the axis

-	 * @param axisElement2

-	 *        the other axis

-	 * @return

-	 *         the value of the cell or {@value #NOT_AVALAIBLE} if the cell is meaningless for the couple of parameters

-	 * 

-	 *         THIS METHOD MUST NOT BE USED IN REPLACEMENT OF A SPECIFIC LABEL PROVIDER

-	 */

-	public Object getValue(final Object axisElement1, final Object axisElement2);

-

-	/**

-	 * Set the newValue to the intersection of the 2 objects

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param obj1

-	 *        the first object

-	 * @param obj2

-	 *        the second object

-	 * @param newValue

-	 *        the new value

-	 */

-	public void setValue(final EditingDomain domain, final Object obj1, final Object obj2, final Object newValue);

-

-	/**

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 *         <code>true</code> if the intersection of the 2 objects is editable

-	 */

-	public boolean isCellEditable(final Object obj1, final Object obj2);

-

-	/**

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param obj1

-	 *        the first object

-	 * @param obj2

-	 *        the second object

-	 * @param newValue

-	 *        the new value to set to the intersection of these 2 objects

-	 * @return

-	 *         the command to set the value

-	 */

-	public Command getSetValueCommand(final EditingDomain domain, final Object obj1, final Object obj2, final Object newValue);

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
deleted file mode 100644
index 78a2d5f8d25..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*****************************************************************************

- * 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.emf.ecore.EObject;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.jface.action.GroupMarker;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.config.EditableRule;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.config.IConfiguration;

-import org.eclipse.nebula.widgets.nattable.coordinate.Range;

-import org.eclipse.nebula.widgets.nattable.copy.command.CopyDataToClipboardCommand;

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.export.command.ExportCommand;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.grid.data.DefaultCornerDataProvider;

-import org.eclipse.nebula.widgets.nattable.grid.layer.CornerLayer;

-import org.eclipse.nebula.widgets.nattable.grid.layer.GridLayer;

-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.layer.ILayerListener;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;

-import org.eclipse.nebula.widgets.nattable.print.command.PrintCommand;

-import org.eclipse.nebula.widgets.nattable.print.command.TurnViewportOffCommand;

-import org.eclipse.nebula.widgets.nattable.print.command.TurnViewportOnCommand;

-import org.eclipse.nebula.widgets.nattable.print.config.DefaultPrintBindings;

-import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;

-import org.eclipse.nebula.widgets.nattable.reorder.event.ColumnReorderEvent;

-import org.eclipse.nebula.widgets.nattable.selection.command.SelectAllCommand;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-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.configuration.CornerConfiguration;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusHeaderMenuConfiguration;

-import org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider;

-import org.eclipse.papyrus.infra.nattable.dataprovider.BodyDataProvider;

-import org.eclipse.papyrus.infra.nattable.dataprovider.ColumnHeaderDataProvider;

-import org.eclipse.papyrus.infra.nattable.dataprovider.RowHeaderDataProvider;

-import org.eclipse.papyrus.infra.nattable.formatter.ExportFormatter;

-import org.eclipse.papyrus.infra.nattable.layer.PapyrusGridLayer;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.layerstack.ColumnHeaderLayerStack;

-import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderLayerStack;

-import org.eclipse.papyrus.infra.nattable.listener.NatTableDropListener;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.provider.TableSelectionProvider;

-import org.eclipse.papyrus.infra.nattable.utils.LocationValue;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.utils.TableGridRegion;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.DropTarget;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.ui.IWorkbenchActionConstants;

-import org.eclipse.ui.IWorkbenchPartSite;

-

-/**

- * 

- * This class allows to create, configure and manipulate NatTable

- * 

- */

-public abstract class AbstractNattableWidgetManager implements INattableModelManager {

-

-	/**

-	 * the managed table

-	 */

-	private Table table;

-

-	/**

-	 * we need to keep it, to be able to remove the listener on it, when the table is destroying

-	 */

-	private EObject tableContext;

-

-	/**

-	 * the nattable widget

-	 */

-	protected NatTable natTable;

-

-	/**

-	 * the grid layer

-	 */

-	private GridLayer gridLayer;

-

-	/**

-	 * the columnHeaderLayerStack

-	 */

-	private ColumnHeaderLayerStack columnHeaderLayerStack;

-

-	/**

-	 * the rowHeaderLayerStack

-	 */

-	private RowHeaderLayerStack rowHeaderLayerStack;

-

-	/**

-	 * the selection provider

-	 */

-	private TableSelectionProvider selectionProvider;

-

-	/**

-	 * the body layer stack

-	 */

-	private BodyLayerStack bodyLayerStack;

-

-	private AbstractDataProvider columnHeaderDataProvider;

-

-	private AbstractDataProvider rowHeaderDataProvider;

-

-	private BodyDataProvider bodyDataProvider;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param table

-	 *        the model of the table

-	 */

-	public AbstractNattableWidgetManager(final Table table) {

-		this.table = table;

-		this.tableContext = table.getContext();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#createNattable(org.eclipse.swt.widgets.Composite, int,

-	 *      org.eclipse.ui.IWorkbenchPartSite)

-	 * 

-	 * @param parent

-	 * @param style

-	 * @param site

-	 * @return

-	 */

-	public NatTable createNattable(final Composite parent, final int style, final IWorkbenchPartSite site) {

-		this.bodyDataProvider = new BodyDataProvider(this);

-		this.bodyLayerStack = new BodyLayerStack(this.bodyDataProvider, this);

-

-		this.columnHeaderDataProvider = new ColumnHeaderDataProvider(this);

-		this.columnHeaderLayerStack = new ColumnHeaderLayerStack(this.columnHeaderDataProvider, this.bodyLayerStack, this.bodyDataProvider);

-

-		this.rowHeaderDataProvider = new RowHeaderDataProvider(this);

-

-

-		this.rowHeaderLayerStack = new RowHeaderLayerStack(this.rowHeaderDataProvider, this.bodyLayerStack);

-

-

-		final IDataProvider cornerDataProvider = new DefaultCornerDataProvider(this.columnHeaderDataProvider, this.rowHeaderDataProvider);

-		final CornerLayer cornerLayer = new CornerLayer(new DataLayer(cornerDataProvider), this.rowHeaderLayerStack, this.columnHeaderLayerStack);

-		cornerLayer.addConfiguration(new CornerConfiguration(this));

-		this.gridLayer = new PapyrusGridLayer(this.bodyLayerStack, this.columnHeaderLayerStack, this.rowHeaderLayerStack, cornerLayer);

-		this.gridLayer.addConfiguration(new DefaultPrintBindings());

-		//		gridLayer.addConfiguration(new StyleConfiguration());

-		//		fBodyLayer.getBodyDataLayer().addConfiguration(new StyleConfiguration());

-		//		fBodyLayer.addConfiguration(new StyleConfiguration());

-

-

-

-

-		this.natTable = new NatTable(parent, this.gridLayer, false);

-

-

-		//for the edition

-		//		configureEdition(this.natTable, this.bodyLayerStack);

-		this.natTable.addConfiguration(new PapyrusHeaderMenuConfiguration());

-		//		this.natTable.addConfiguration(new HeaderMenuConfiguration(this.natTable));

-		this.natTable.addConfiguration(new IConfiguration() {

-

-

-			public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-				// TODO Auto-generated method stub

-

-			}

-

-

-			public void configureRegistry(IConfigRegistry configRegistry) {

-				configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, new EditableRule() {

-

-					@Override

-					public boolean isEditable(int columnIndex, int rowIndex) {

-

-						final Object obj1 = AbstractNattableWidgetManager.this.rowHeaderDataProvider.getDataValue(1, rowIndex);

-						final Object obj2 = AbstractNattableWidgetManager.this.columnHeaderDataProvider.getDataValue(columnIndex, 1);

-						return CellManagerFactory.INSTANCE.isCellEditable(obj1, obj2);

-					}

-				});

-

-				configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, null, DisplayMode.EDIT, ""); //$NON-NLS-1$

-

-			}

-

-

-			public void configureLayer(ILayer layer) {

-				// TODO Auto-generated method stub

-

-			}

-		});

-

-		configureNatTable();

-		addColumnReorderListener(this.bodyLayerStack.getColumnReorderLayer());

-		addDragAndDropSupport(this.natTable);

-

-

-		if(site != null) {

-			final MenuManager menuMgr = createMenuManager(this.natTable);

-			final Menu menu = menuMgr.createContextMenu(this.natTable);

-			this.natTable.setMenu(menu);

-

-			this.selectionProvider = new TableSelectionProvider(this.bodyLayerStack.getSelectionLayer());

-			site.registerContextMenu(menuMgr, this.selectionProvider);

-			site.setSelectionProvider(this.selectionProvider);

-		}

-

-		return this.natTable;

-	}

-

-	protected void configureNatTable() {

-		if(this.natTable != null && !this.natTable.isDisposed()) {

-			this.natTable.setConfigRegistry(createAndInitializeNewConfigRegistry());

-			this.natTable.setUiBindingRegistry(new UiBindingRegistry(this.natTable));

-			this.natTable.configure();

-		}

-	}

-

-	protected IConfigRegistry createAndInitializeNewConfigRegistry() {

-		final IConfigRegistry newRegistry = new ConfigRegistry();

-		if(!this.natTable.isDisposed()) {

-			newRegistry.registerConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, this, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			newRegistry.registerConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, getLabelProviderService(), DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-			//commented because seems generate several bugs with edition

-			//newRegistry.registerConfigAttribute( CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter(), DisplayMode.NORMAL,  GridRegion.BODY);

-			newRegistry.registerConfigAttribute(CellConfigAttributes.EXPORT_FORMATTER, new ExportFormatter());

-		}

-		return newRegistry;

-	}

-

-	private LabelProviderService getLabelProviderService() {

-		try {

-			ServicesRegistry serviceRegistry = ServiceUtilsForEObject.getInstance().getServiceRegistry(this.table.getContext());//get context and NOT get table for the usecase where the table is not in a resource

-			return serviceRegistry.getService(LabelProviderService.class);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param natTable

-	 * @return

-	 */

-	public MenuManager createMenuManager(final NatTable natTable) {

-		final MenuManager menuManager = new MenuManager("#PopUp", "org.eclipse.papyrus.infra.nattable.widget.menu") { //$NON-NLS-1$ //$NON-NLS-2$

-

-			@Override

-			public void add(final IAction action) {

-				super.add(action);

-			}

-

-			@Override

-			public void add(final IContributionItem item) {

-				super.add(item);

-			}

-		};

-		menuManager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));

-

-		menuManager.setRemoveAllWhenShown(true);

-		return menuManager;

-	}

-

-	/**

-	 * Enable the table to receive dropped elements

-	 * 

-	 * @param nattable

-	 *        the nattable widget in which we add the drag&drop support

-	 */

-	protected void addDragAndDropSupport(final NatTable nattable) {

-		final int operations = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT;

-		final DropTarget target = new DropTarget(nattable, operations);

-		final LocalTransfer localTransfer = LocalTransfer.getInstance();

-		final Transfer[] types = new Transfer[]{ localTransfer };

-		target.setTransfer(types);

-		final NatTableDropListener dropListener = new NatTableDropListener(this);

-		target.addDropListener(dropListener);

-	}

-

-	/**

-	 * Add a listener on the column reorder layer in order to update the model

-	 * 

-	 * @param columnReorderLayer

-	 *        the column reorder layer

-	 */

-	private void addColumnReorderListener(final ColumnReorderLayer columnReorderLayer) {

-		columnReorderLayer.addLayerListener(new ILayerListener() {

-

-

-			public void handleLayerEvent(final ILayerEvent event) {

-				if(event instanceof ColumnReorderEvent) {

-					ColumnReorderEvent columnReorderEvent = (ColumnReorderEvent)event;

-					int start = -1;

-					int end = columnReorderEvent.getBeforeToColumnPosition();

-					for(Range range : columnReorderEvent.getBeforeFromColumnPositionRanges()) {

-						start = range.start;

-						break;

-					}

-					if(start != -1) {

-						// This solve an index difference between moving

-						// a column from right to left and moving a

-						// column from left to right

-						if(start >= 0 && start < end) {

-							end--;

-						}

-						final List<IAxis> allAxis = AbstractNattableWidgetManager.this.table.getCurrentColumnAxisProvider().getAxis();

-						final IAxis axisToMove = allAxis.get(start);

-						if(axisToMove != null) {

-							moveColumnElement(axisToMove, end);

-						}

-					}

-				}

-			}

-		});

-	}

-

-

-

-	/**

-	 * 

-	 * @param event

-	 *        an event

-	 * @return

-	 *         a LocationValue for the point, which contains informations about this location (TableGridRegion, row and column index, row and column

-	 *         elements, the cell, the point and its translation).

-	 *         Some of these values can be <code>null</code> or not depending of the region of the table

-	 */

-	public LocationValue getLocationInTheTable(final Point absolutePoint) {

-		final Point widgetPoint = this.natTable.toControl(absolutePoint.x, absolutePoint.y);

-		TableGridRegion kind = TableGridRegion.UNKNOWN;

-		int columnPosition = this.natTable.getColumnPositionByX(widgetPoint.x);

-		int columnIndex = this.natTable.getColumnIndexByPosition(columnPosition);

-		int rowPosition = this.natTable.getRowPositionByY(widgetPoint.y);

-		int rowIndex = this.natTable.getRowIndexByPosition(rowPosition);

-		final ILayerCell cell = this.natTable.getCellByPosition(columnPosition, rowPosition);

-		Object columnObject = null;

-		Object rowObject = null;

-		if(rowIndex == -1 && columnIndex == -1) {

-			kind = TableGridRegion.UNKNOWN;

-		} else if(rowIndex == -1) {

-			kind = TableGridRegion.AFTER_ROW_HEADER;

-		} else if(columnIndex == -1) {

-			kind = TableGridRegion.AFTER_COLUMN_HEADER;

-		} else {

-			if(cell != null) {

-				LabelStack label = cell.getConfigLabels();

-				if(label.hasLabel(GridRegion.ROW_HEADER)) {

-					kind = TableGridRegion.ROW_HEADER;

-

-				} else if(label.hasLabel(GridRegion.COLUMN_HEADER)) {

-					kind = TableGridRegion.COLUMN_HEADER;

-

-				} else if(label.hasLabel(GridRegion.CORNER)) {

-					kind = TableGridRegion.CORNER;

-				} else if(label.hasLabel(GridRegion.BODY)) {

-					kind = TableGridRegion.CELL;

-					columnObject = getColumnElement(columnIndex);

-					rowObject = getRowElement(rowIndex);

-				}

-			}

-		}

-		return new LocationValue(absolutePoint, widgetPoint, kind, cell, columnIndex, rowIndex, columnObject, rowObject);

-	}

-

-

-	public GridLayer getGridLayer() {

-		return this.gridLayer;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#print()

-	 * 

-	 */

-	public void print() {

-		this.natTable.doCommand(new TurnViewportOffCommand());

-		this.natTable.doCommand(new PrintCommand(this.natTable.getConfigRegistry(), this.natTable.getShell()));

-		this.natTable.doCommand(new TurnViewportOnCommand());

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#selectAll()

-	 * 

-	 */

-	public void selectAll() {

-		this.natTable.doCommand(new SelectAllCommand());

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#exportToXLS()

-	 * 

-	 */

-	public void exportToXLS() {

-		this.natTable.doCommand(new ExportCommand(this.natTable.getConfigRegistry(), this.natTable.getShell()));

-	}

-

-	public void copyToClipboard() {

-		this.natTable.doCommand(new CopyDataToClipboardCommand("\t", "\n", this.natTable.getConfigRegistry()));

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getBodyLayerStack()

-	 * 

-	 * @return

-	 */

-	public BodyLayerStack getBodyLayerStack() {

-		return this.bodyLayerStack;

-	}

-

-	public void dispose() {

-		this.bodyDataProvider.dispose();

-		this.rowHeaderDataProvider.dispose();

-		this.columnHeaderDataProvider.dispose();

-		this.tableContext = null;

-	}

-

-	public EObject getTableContext() {

-		return this.tableContext;

-	}

-

-	public Table getTable() {

-		return this.table;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ILimitedNattableModelManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ILimitedNattableModelManager.java
deleted file mode 100644
index 49dd414f783..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ILimitedNattableModelManager.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************

- * 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.nattableaxisprovider.AbstractAxisProvider;

-

-

-public interface ILimitedNattableModelManager {

-

-	public List<Object> getElementsList(final AbstractAxisProvider axisProvider);

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
deleted file mode 100644
index 956c0aa9732..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*****************************************************************************

- * 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.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.utils.LocationValue;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.IWorkbenchPartSite;

-import org.eclipse.ui.services.IDisposable;

-

-

-public interface INattableModelManager extends ILimitedNattableModelManager, ITableAxisElementProvider, IDisposable, IDataProvider {

-

-

-	public int getColumnCount();

-

-	public int getRowCount();

-

-	public void addRows(final Collection<Object> objectsToAdd);

-

-	public void addColumns(final Collection<Object> objectsToAdd);

-

-	public boolean canInsertRow(final Collection<Object> objectsToAdd, int index);

-

-	public boolean canInsertColumns(final Collection<Object> objectsToAdd, int index);

-

-	public boolean canDropColumnsElement(final Collection<Object> objectsToAdd);

-

-	public boolean canDropRowElement(final Collection<Object> objectsToAdd);

-

-	public void insertRows(final Collection<Object> objectsToAdd, int index);

-

-	public void insertColumns(final Collection<Object> objectsToAdd, int index);

-

-	public IDataProvider getBodyDataProvider();

-

-	public boolean canMoveColumns();

-

-	public boolean canMoveRows();

-

-	public void moveColumnElement(final Object axisToMove, final int newIndex);

-

-	public void moveRowElement(final Object axisToMove, final int newIndex);

-

-	public void invertAxis();

-

-	public boolean canInvertAxis();

-

-	public boolean declareEditorsOnColumns();

-

-	public boolean declareEditorsOnRows();

-

-	public Table getTable();

-

-	public ITableAxisElementProvider getTableAxisElementProvider();

-

-	public NatTable createNattable(final Composite parent, int style, IWorkbenchPartSite site);

-

-	public LocationValue getLocationInTheTable(final Point location);

-

-	public List<Object> getElementsList(final AbstractAxisProvider axisProvider);

-

-	public boolean canCreateRowElement(String elementType);

-

-	public boolean canCreateColumnElement(String elementType);

-

-	public Command getAddRowElementCommand(Collection<Object> objectsToAdd);

-

-	public Command getAddColumnElementCommand(Collection<Object> objectsToAdd);

-

-

-

-	public void print();

-

-	public void selectAll();

-

-	public void exportToXLS();

-

-	/**

-	 * Opens a dialog to choose the columns to display or to destroy. This action doesn't create or destroy model element. It can only create/destroy

-	 * axis

-	 */

-	public void openCreateDestroyColumnsManagerDialog();

-

-	/**

-	 * Opens a dialog to choose the columns to display or to destroy. This action doesn't create or destroy model element. It can only create/destroy

-	 * axis

-	 */

-	public void openCreateDestroyRowsManagerDialog();

-

-	/**

-	 * Returns <code>true</code> if columns axis can be destroyed (only are will be destroyed, the model element won't be destroyed)

-	 * 

-	 * @return

-	 */

-	public boolean canCreateDestroyColumnsAxis();

-

-	/**

-	 * Returns <code>true</code> if columns axis can be destroyed (only are will be destroyed, the model element won't be destroyed)

-	 * 

-	 * @return

-	 */

-	public boolean canCreateDestroyRowsAxis();

-

-	public void sortColumnsByName(final boolean alphabeticOrder);

-

-	public void sortRowsByName(final boolean alphabeticOrder);

-

-

-	/**

-	 * 

-	 * @return

-	 *         the "real"{@link AbstractAxisProvider}, that's to say that this method use the property {@link Table#isInvertAxis()} to return the real

-	 *         vertical axis

-	 */

-	public AbstractAxisProvider getVerticalAxisProvider();

-

-	/**

-	 * 

-	 * @return

-	 *         the "real"{@link AbstractAxisProvider}, that's to say that this method use the property {@link Table#isInvertAxis()} to return the real

-	 *         horizontal axis

-	 */

-	public AbstractAxisProvider getHorizontalAxisProvider();

-

-	public BodyLayerStack getBodyLayerStack();

-

-	/**

-	 * Opens a dialog to edit the alias of the row

-	 * 

-	 * @param event

-	 */

-	public void openEditRowAliasDialog(final NatEventData event);

-

-	/**

-	 * Opens a dialog to edit the alias of the column

-	 * 

-	 * @param event

-	 */

-	public void openEditColumnAliasDialog(final NatEventData event);

-

-	public boolean canEditColumnHeader(final NatEventData eventData);

-

-	public boolean canEditRowHeader(final NatEventData eventData);

-

-	/**

-	 * 

-	 * @return

-	 *         the column axis manager, managing the axis inversion

-	 */

-	public IAxisManager getColumnAxisManager();

-

-	/**

-	 * 

-	 * @return

-	 *         the row axis manager, managing the axis inversion

-	 */

-	public IAxisManager getRowAxisManager();

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
deleted file mode 100644
index fca9006646b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************

- * 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;

-

-

-public interface ITableAxisElementProvider {

-

-	public List<Object> getColumnElementsList();

-

-	public List<Object> getRowElementsList();

-

-	public Object getColumnElement(int index);

-

-	public Object getRowElement(int index);

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
deleted file mode 100644
index 5954ffdd303..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.table;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.List;

-

-import org.eclipse.core.commands.State;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ViewerComparator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.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.command.CommandIds;

-import org.eclipse.papyrus.infra.nattable.dialog.DisplayedAxisSelectorDialog;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AxisManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-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.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.utils.StringComparator;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.widgets.providers.FlattenableRestrictedFilteredContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.swt.events.FocusEvent;

-import org.eclipse.swt.events.FocusListener;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IWorkbenchPartSite;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandService;

-

-public class NattableModelManager extends AbstractNattableWidgetManager implements INattableModelManager {

-

-	/**

-	 * the column manager

-	 */

-	private ICompositeAxisManager columnManager;

-

-	/**

-	 * the line manager

-	 */

-	private ICompositeAxisManager rowManager;

-

-	/**

-	 * the model of the table on which we are working

-	 */

-	private List<Object> verticalElements;

-

-	private List<Object> horizontalElements;

-

-	private Adapter invertAxisListener;

-

-	private AbstractAxisProvider rowProvider;

-

-	private AbstractAxisProvider columnProvider;

-

-	/**

-	 * this listener listen the stack events and refresh nattable

-	 */

-	private CommandStackListener refreshListener;

-

-	/**

-	 * the focus listener

-	 */

-	private FocusListener focusListener;

-

-	/**

-	 * we need to keep it to be able to remove listener (required when we destroy the context of the table)

-	 */

-	private TransactionalEditingDomain contextEditingDomain;

-

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param rawModel

-	 * 

-	 *        the model of the managed table

-	 */

-	public NattableModelManager(final Table rawModel) {

-		super(rawModel);

-		this.rowProvider = rawModel.getCurrentRowAxisProvider();

-		this.columnProvider = rawModel.getCurrentColumnAxisProvider();

-		this.verticalElements = Collections.synchronizedList(new ArrayList<Object>());

-		this.horizontalElements = Collections.synchronizedList(new ArrayList<Object>());

-

-

-		this.invertAxisListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if(msg.getEventType() == Notification.SET) {

-					final Object oldValue = msg.getOldValue();

-					final Object newValue = msg.getNewValue();

-					if(oldValue != null && newValue != null) {

-						if(msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {

-							invertJavaObject();

-

-						}

-					}

-				}

-			}

-		};

-

-		rawModel.eAdapters().add(this.invertAxisListener);

-		init();

-		if(rawModel.isInvertAxis()) {

-			invertJavaObject();

-		}

-	}

-

-

-	@Override

-	public NatTable createNattable(Composite parent, int style, IWorkbenchPartSite site) {

-		final NatTable nattable = super.createNattable(parent, style, site);

-		this.refreshListener = new CommandStackListener() {

-

-			/**

-			 * 

-			 * @see org.eclipse.emf.common.command.CommandStackListener#commandStackChanged(java.util.EventObject)

-			 * 

-			 * @param event

-			 */

-			public void commandStackChanged(EventObject event) {

-				//we refresh the table after each command, only when it is visible

-				//its allows to refresh the text and the appearance of the table

-				//this refresh doesn't manage the add/remove axis

-				if(nattable != null && !nattable.isDisposed() && nattable.isVisible()) {

-					nattable.refresh();

-				}

-			}

-		};

-

-		getContextEditingDomain().getCommandStack().addCommandStackListener(this.refreshListener);

-

-		this.focusListener = new FocusListener() {

-

-			public void focusLost(FocusEvent e) {

-				//nothing to do

-			}

-

-			public void focusGained(FocusEvent e) {

-				updateToggleActionState();

-			}

-		};

-		nattable.addFocusListener(this.focusListener);

-		updateToggleActionState();//required, because the focus listener is not notified just after the creation of the widget

-		return nattable;

-	}

-

-	/**

-	 * this command update the status of the toggle actions

-	 */

-	protected void updateToggleActionState() {

-		final ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);

-		if(commandService != null) {

-

-			final AbstractHeaderAxisConfiguration columnAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisUsedInTable(getTable());

-			final AbstractHeaderAxisConfiguration rowAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getTable());

-			//update the header configuration

-			org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_INDEX_ID);

-			updateToggleCommandState(command, columnAxisConfiguration.isDisplayIndex());

-

-			command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_LABEL_ID);

-			updateToggleCommandState(command, columnAxisConfiguration.isDisplayLabel());

-

-			command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_INDEX_STYLE_ID);

-			updateRadioCommandState(command, columnAxisConfiguration.getIndexStyle().getLiteral());

-

-			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_INDEX_ID);

-			updateToggleCommandState(command, rowAxisConfiguration.isDisplayIndex());

-

-			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_LABEL_ID);

-			updateToggleCommandState(command, rowAxisConfiguration.isDisplayLabel());

-

-			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_INDEX_STYLE_ID);

-			updateRadioCommandState(command, rowAxisConfiguration.getIndexStyle().getLiteral());

-

-

-			//update the label header configuration

-			final List<ILabelProviderConfiguration> columnLabelConfigurations = columnAxisConfiguration.getOwnedLabelConfigurations();

-			final List<ILabelProviderConfiguration> rowLabelConfigurations = rowAxisConfiguration.getOwnedLabelConfigurations();

-			for(final ILabelProviderConfiguration current : columnLabelConfigurations) {

-				if(current instanceof ObjectLabelProviderConfiguration) {

-					final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration)current;

-					command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_DISPLAY_ICON);

-					updateToggleCommandState(command, labelConfig.isDisplayIcon());

-

-					command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_DISPLAY_LABEL);

-					updateToggleCommandState(command, labelConfig.isDisplayLabel());

-

-					if(labelConfig instanceof FeatureLabelProviderConfiguration) {

-						final FeatureLabelProviderConfiguration labelFeatureConf = (FeatureLabelProviderConfiguration)labelConfig;

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_IS_DERIVED);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayIsDerived());

-

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_MULTIPLICITY);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayMultiplicity());

-

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_TYPE);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayType());

-

-

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_NAME);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayName());

-					}

-				}

-			}

-

-			for(final ILabelProviderConfiguration current : rowLabelConfigurations) {

-				if(current instanceof ObjectLabelProviderConfiguration) {

-					final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration)current;

-

-					command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_DISPLAY_ICON);

-					updateToggleCommandState(command, labelConfig.isDisplayIcon());

-

-					command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_DISPLAY_LABEL);

-					updateToggleCommandState(command, labelConfig.isDisplayLabel());

-

-					if(labelConfig instanceof FeatureLabelProviderConfiguration) {

-						final FeatureLabelProviderConfiguration labelFeatureConf = (FeatureLabelProviderConfiguration)labelConfig;

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_IS_DERIVED);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayIsDerived());

-

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_MULTIPLICITY);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayMultiplicity());

-

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_TYPE);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayType());

-

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_NAME);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayName());

-					}

-				}

-			}

-

-			//update the property IMasterObjectAxisProvider#disconnectslave

-			if(columnProvider instanceof ISlaveAxisProvider) {

-				command = commandService.getCommand(CommandIds.COMMAND_ROW_DISCONNECT_SLAVE);

-				updateToggleCommandState(command, ((IMasterAxisProvider)rowProvider).isDisconnectSlave());

-			}

-

-			if(rowProvider instanceof ISlaveAxisProvider) {

-				command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISCONNECT_SLAVE);

-				updateToggleCommandState(command, ((IMasterAxisProvider)columnProvider).isDisconnectSlave());

-			}

-

-			//we update the state for the invert axis command

-			command = commandService.getCommand(CommandIds.COMMAND_INVERT_AXIS);

-			updateToggleCommandState(command, getTable().isInvertAxis());

-

-		} else {

-			throw new RuntimeException(String.format("The Eclipse service {0} has not been found", ICommandService.class)); //$NON-NLS-1$

-		}

-

-	}

-

-	/**

-	 * 

-	 * @param command

-	 *        an eclipse command

-	 * @param newValue

-	 *        the new boolean value to set to the state of this command

-	 */

-	private void updateToggleCommandState(final org.eclipse.core.commands.Command command, final boolean newValue) {

-		if(command != null) {

-			final State state = command.getState(CommandIds.TOGGLE_STATE);

-			if(state != null) {

-				state.setValue(newValue);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param command

-	 *        an eclispe command

-	 * @param newValue

-	 *        the new value to set to the state of this command

-	 */

-	private void updateRadioCommandState(final org.eclipse.core.commands.Command command, final Object newValue) {

-		if(command != null) {

-			final State state = command.getState(CommandIds.RADIO_STATE);

-			if(state != null) {

-				state.setValue(newValue);

-			}

-		}

-	}

-

-	public void invertJavaObject() {

-		AbstractAxisProvider newColumProvider = this.rowProvider;

-		AbstractAxisProvider newRowProvider = this.columnProvider;

-		List<Object> newVerticalElementList = this.horizontalElements;

-		List<Object> newHorizontalElementList = this.verticalElements;

-		ICompositeAxisManager newRowManager = this.columnManager;

-		ICompositeAxisManager newColumnManager = this.rowManager;

-

-		NattableModelManager.this.columnProvider = newColumProvider;

-		NattableModelManager.this.rowProvider = newRowProvider;

-

-		NattableModelManager.this.verticalElements = newVerticalElementList;

-		NattableModelManager.this.horizontalElements = newHorizontalElementList;

-

-		NattableModelManager.this.rowManager = newRowManager;

-		NattableModelManager.this.columnManager = newColumnManager;

-		updateToggleActionState();

-		configureNatTable();

-		refreshNatTable();

-	}

-

-	/**

-	 * create the line and the columns managers

-	 */

-	protected void init() {

-		this.columnManager = createAxisManager(getTable().getTableConfiguration().getColumnHeaderAxisConfiguration().getAxisManagers(), getTable().getCurrentColumnAxisProvider());

-		this.rowManager = createAxisManager(getTable().getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers(), getTable().getCurrentRowAxisProvider());

-		boolean allIsSlave = this.columnManager.isSlave() && this.rowManager.isSlave();

-		Assert.isTrue(!allIsSlave, Messages.NattableModelManager_AtLeastOfOneTheAxisManagerMustBeAMaster);

-	}

-

-	/**

-	 * 

-	 * @param ids

-	 *        the ids of the axis manager to use

-	 * @param contentProvider

-	 *        the content provider in the model

-	 * @return the created axis manager to use to manage the {@link IAxisContentsProvider}

-	 */

-	protected ICompositeAxisManager createAxisManager(final List<AxisManagerRepresentation> representations, final AbstractAxisProvider contentProvider) {

-		final List<IAxisManager> managers = new ArrayList<IAxisManager>();

-		for(AxisManagerRepresentation current : representations) {

-			final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);

-			assert manager != null;

-			manager.init(this, current, contentProvider);

-			managers.add(manager);

-		}

-		final ICompositeAxisManager compositeAxisManager = new CompositeAxisManager();

-		compositeAxisManager.init(this, null, contentProvider);

-		compositeAxisManager.setSubAxisManager(managers);

-		return compositeAxisManager;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		this.columnManager.dispose();

-		this.rowManager.dispose();

-		getContextEditingDomain().getCommandStack().removeCommandStackListener(this.refreshListener);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#addRows(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 *        the list of the objects to add in rows

-	 */

-	public void addRows(final Collection<Object> objectsToAdd) {

-		final EditingDomain domain = getContextEditingDomain();

-		final Command cmd = getAddRowElementCommand(objectsToAdd);

-		if(cmd != null && cmd.canExecute()) {

-			domain.getCommandStack().execute(cmd);

-		}

-	}

-

-	/**

-	 * called when the manager is used vertically

-	 */

-	public int getColumnCount() {

-		return this.getColumnElementsList().size();

-	}

-

-	/**

-	 * called when the manager is used horizontally

-	 */

-

-	public int getRowCount() {

-		return this.getRowElementsList().size();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#addColumns(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 *        the list of the objects to add in columns

-	 */

-	public void addColumns(final Collection<Object> objectsToAdd) {

-		final EditingDomain domain = getContextEditingDomain();

-		final Command cmd = getAddColumnElementCommand(objectsToAdd);

-		if(cmd != null && cmd.canExecute()) {

-			domain.getCommandStack().execute(cmd);

-		}

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the table

-	 * 

-	 * @return

-	 */

-	private EditingDomain getTableEditingDomain() {

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTable());

-			return registry.getService(EditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-

-		return null;

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the context

-	 * 

-	 * @return

-	 */

-	private EditingDomain getContextEditingDomain() {

-		if(this.contextEditingDomain == null) {

-			ServicesRegistry registry = null;

-			try {

-				registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTableContext());

-				this.contextEditingDomain = registry.getService(TransactionalEditingDomain.class);

-			} catch (final ServiceException e) {

-				Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-			}

-		}

-		return this.contextEditingDomain;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getBodyDataProvider()

-	 * 

-	 * @return the data provider for the body of the table

-	 */

-	public IDataProvider getBodyDataProvider() {

-		return this;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)

-	 * 

-	 * @param columnIndex

-	 *        the index of the column

-	 * @param rowIndex

-	 *        the index of the row

-	 * @return the contents to display in the cell localted to columnIndex and

-	 *         rowIndex

-	 */

-	public Object getDataValue(final int columnIndex, final int rowIndex) {

-		final Object obj1 = this.verticalElements.get(columnIndex);

-		final Object obj2 = this.horizontalElements.get(rowIndex);

-		return CellManagerFactory.INSTANCE.getCrossValue(obj1, obj2);

-	}

-

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		final Object obj1 = this.verticalElements.get(columnIndex);

-		final Object obj2 = this.horizontalElements.get(rowIndex);

-		CellManagerFactory.INSTANCE.setCellValue(getContextEditingDomain(), obj1, obj2, newValue);

-	}

-

-	/**

-	 * refresh NatTable (asyncExec)

-	 */

-	public void refreshNatTable() {

-		Display.getDefault().asyncExec(new Runnable() {

-

-			public void run() {

-				NattableModelManager.this.natTable.refresh();

-			}

-		});

-	}

-

-

-	/**

-	 * 

-	 * @param axis

-	 *        the axis for which must refresh the contents

-	 */

-	public void updateAxisContents(final AbstractAxisProvider axis) {

-		Display.getDefault().asyncExec(new Runnable() {//required, because we get the event before the changes

-

-			public void run() {

-				if(NattableModelManager.this.natTable != null && !NattableModelManager.this.natTable.isDisposed()) {

-					if(axis == NattableModelManager.this.columnProvider) {

-						updateColumnContents();

-					} else {

-						updateRowContents();

-					}

-				}

-			}

-		});

-	}

-

-	/**

-	 * refresh the row contents

-	 */

-	private void updateRowContents() {

-		NattableModelManager.this.rowManager.updateAxisContents();

-		CellEditorDeclaration declaration = getCellEditorDeclarationToUse(getTable());

-		if(declaration.equals(CellEditorDeclaration.ROW)) {

-			configureNatTable();

-			refreshNatTable();

-		} else {

-			refreshNatTable();

-		}

-	}

-

-

-

-	/**

-	 * refresh the column contents

-	 */

-	private void updateColumnContents() {

-		NattableModelManager.this.columnManager.updateAxisContents();

-		CellEditorDeclaration declaration = getCellEditorDeclarationToUse(getTable());

-		if(declaration.equals(CellEditorDeclaration.COLUMN)) {

-			configureNatTable();

-			refreshNatTable();

-		} else {

-			refreshNatTable();

-		}

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @return

-	 *         the celleditor declaration to use according to the table configuration and {@link Table#isInvertAxis()}

-	 */

-	private CellEditorDeclaration getCellEditorDeclarationToUse(final Table table) {

-		CellEditorDeclaration declaration = table.getTableConfiguration().getCellEditorDeclaration();

-		if(getTable().isInvertAxis()) {

-			if(declaration.equals(CellEditorDeclaration.COLUMN)) {

-				declaration = CellEditorDeclaration.ROW;

-			} else if(declaration.equals(CellEditorDeclaration.ROW)) {

-				declaration = CellEditorDeclaration.COLUMN;

-			}

-		}

-		return declaration;

-	}

-

-	public List<Object> getColumnElementsList() {

-		return this.verticalElements;

-	}

-

-	public List<Object> getRowElementsList() {

-		return this.horizontalElements;

-	}

-

-	public boolean canInsertRow(Collection<Object> objectsToAdd, int index) {

-		return this.rowManager.canInsertAxis(objectsToAdd, index);

-	}

-

-	public boolean canInsertColumns(Collection<Object> objectsToAdd, int index) {

-		return this.columnManager.canInsertAxis(objectsToAdd, index);

-	}

-

-	public boolean canDropColumnsElement(Collection<Object> objectsToAdd) {

-		return this.columnManager.canDropAxisElement(objectsToAdd);

-	}

-

-	public boolean canDropRowElement(Collection<Object> objectsToAdd) {

-		return this.rowManager.canDropAxisElement(objectsToAdd);

-	}

-

-	public void insertRows(Collection<Object> objectsToAdd, int index) {

-		this.rowManager.getInsertAxisCommand(objectsToAdd, index);

-

-	}

-

-	public void insertColumns(Collection<Object> objectsToAdd, int index) {

-		this.columnManager.getInsertAxisCommand(objectsToAdd, index);

-	}

-

-	public Object getColumnElement(int index) {

-		return this.verticalElements.get(index);

-	}

-

-	public Object getRowElement(int index) {

-		return this.horizontalElements.get(index);

-	}

-

-	public List<Object> getElementsList(AbstractAxisProvider axisProvider) {

-		if(axisProvider == this.columnProvider) {

-			return this.verticalElements;

-		} else if(axisProvider == this.rowProvider) {

-			return this.horizontalElements;

-		}

-		return null;

-	}

-

-	public boolean canMoveRows() {

-		return this.rowManager.canMoveAxis();

-	}

-

-	public boolean canMoveColumns() {

-		return this.columnManager.canMoveAxis();

-	}

-

-	public void moveColumnElement(final Object axisToMove, final int newIndex) {

-		this.columnManager.moveAxis(axisToMove, newIndex);

-	}

-

-	// not tested

-	public void moveRowElement(final Object axisToMove, final int newIndex) {

-		this.rowManager.moveAxis(axisToMove, newIndex);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#invertAxis()

-	 * 

-	 */

-	public void invertAxis() {

-		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_SwitchLinesAndColumns);

-		final EditingDomain domain = getContextEditingDomain();

-		boolean oldValue = getTable().isInvertAxis();

-		if(canInvertAxis()) {

-			Command tmp = new SetCommand(domain, getTable(), NattablePackage.eINSTANCE.getTable_InvertAxis(), !oldValue);

-			cmd.append(tmp);

-			domain.getCommandStack().execute(cmd);

-		}

-	}

-

-	public boolean canInvertAxis() {

-		return this.columnManager.canBeUsedAsRowManager() && this.rowManager.canBeUsedAsColumnManager();

-	}

-

-	public boolean canCreateRowElement(String elementType) {

-		return this.rowManager.canCreateAxisElement(elementType);

-	}

-

-	public boolean canCreateColumnElement(String elementType) {

-		// TODO Auto-generated method stub

-		return true;

-	}

-

-	public Command getAddRowElementCommand(Collection<Object> objectsToAdd) {

-		final EditingDomain domain = getContextEditingDomain();

-		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_AddRowCommand);

-		Command tmp = this.rowManager.getAddAxisCommand(domain, objectsToAdd);

-		if(tmp != null) {

-			cmd.append(tmp);

-		}

-		final AbstractAxisProvider rowsProvider = AxisUtils.getAxisProviderUsedForRows(this);

-		final AbstractAxisProvider columnsProvider = AxisUtils.getAxisProviderUsedForColumns(this);

-		boolean addComplementaryAxis = rowsProvider instanceof IMasterAxisProvider && columnsProvider instanceof ISlaveAxisProvider && !((IMasterAxisProvider)rowsProvider).isDisconnectSlave();

-		if(addComplementaryAxis) {

-			tmp = this.columnManager.getComplementaryAddAxisCommand(domain, objectsToAdd);

-			if(tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		return cmd;

-	}

-

-	public Command getAddColumnElementCommand(Collection<Object> objectsToAdd) {

-		final EditingDomain domain = getContextEditingDomain();

-		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_AddColumnCommand);

-		Command tmp = this.columnManager.getAddAxisCommand(domain, objectsToAdd);

-		if(tmp != null) {

-			cmd.append(tmp);

-		}

-		final AbstractAxisProvider rowsProvider = AxisUtils.getAxisProviderUsedForRows(this);

-		final AbstractAxisProvider columnsProvider = AxisUtils.getAxisProviderUsedForColumns(this);

-		boolean addComplementaryAxis = columnsProvider instanceof IMasterAxisProvider && rowsProvider instanceof ISlaveAxisProvider && !((IMasterAxisProvider)columnsProvider).isDisconnectSlave();

-		if(addComplementaryAxis) {

-			tmp = this.rowManager.getComplementaryAddAxisCommand(domain, objectsToAdd);

-			if(tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		return cmd;

-	}

-

-	public Command getDestroyColumnElementCommand(Collection<Object> objectsToDestroy) {

-		final EditingDomain domain = getContextEditingDomain();

-		final Command cmd = this.columnManager.getDestroyAxisCommand(domain, objectsToDestroy);

-		return cmd;

-	}

-

-	public Command getDestroyRowElementCommand(Collection<Object> objectsToDestroy) {

-		final EditingDomain domain = getContextEditingDomain();

-		final Command cmd = this.rowManager.getDestroyAxisCommand(domain, objectsToDestroy);

-		return cmd;

-	}

-

-

-	public boolean declareEditorsOnColumns() {

-		return true;

-	}

-

-	public boolean declareEditorsOnRows() {

-		return false;

-	}

-

-	public ITableAxisElementProvider getTableAxisElementProvider() {// FIXME :

-																	// must be

-																	// renamed?

-		return this;

-	}

-

-

-

-

-	/**

-	 * When the axis manager is dynamic, we can't destroy axis

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canCreateDestroyColumnsAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canCreateDestroyColumnsAxis() {

-		return !this.columnManager.isDynamic() && this.columnManager.createPossibleAxisContentProvider(true) != null;

-	}

-

-	/**

-	 * When the axis manager is dynamic, we can't destroy axis

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canCreateDestroyRowsAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canCreateDestroyRowsAxis() {

-		return !this.rowManager.isDynamic() && this.rowManager.createPossibleAxisContentProvider(true) != null;

-	}

-

-	/**

-	 * 

-	 * @param serv

-	 *        the label provider service

-	 * @param editedAxisManager

-	 *        the manager used for the edited axis

-	 * @param secondAxisManager

-	 *        the manager used for the other axis

-	 * @param isEditingColumns

-	 *        boolean indicating if we are editing columns or rows

-	 */

-	private final void openCreateDestroyAxisManagerDialog(boolean isEditingColumns) {

-		final String dialogTitle;

-		final String dialogCheckBoxTootip;

-		final String dialogQuestion;

-

-		final IAxisManager editedAxisManager;

-		final IAxisManager secondAxisManager;

-		final String checkBoxMessage = Messages.NattableModelManager_DisconnectThisAxisManager;

-		if(isEditingColumns) {

-			dialogTitle = Messages.NattableModelManager_SelectColumns;

-			dialogCheckBoxTootip = Messages.NattableModelManager_DisableTheAutomaticAdditionOfColumnsWhenARowIsAdded;

-			dialogQuestion = String.format(Messages.NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticColumnAddition, checkBoxMessage);

-

-			editedAxisManager = columnManager;

-			secondAxisManager = rowManager;

-		} else {

-			dialogTitle = Messages.NattableModelManager_SelectRows;

-			dialogCheckBoxTootip = Messages.NattableModelManager_DisableTheAutomaticAdditionOfRowsWhenAColumnIsAdded;

-			dialogQuestion = String.format(Messages.NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticRowAddition, checkBoxMessage);

-

-			editedAxisManager = rowManager;

-			secondAxisManager = columnManager;

-		}

-		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider labelProvider = serv.getLabelProvider();

-		final AbstractAxisProvider editedAxisProvider = editedAxisManager.getRepresentedContentProvider();

-		final AbstractAxisProvider secondAxisProvider = secondAxisManager.getRepresentedContentProvider();

-		ReferenceSelector selector = new ReferenceSelector(true) {

-

-			@Override

-			public void createControls(Composite parent) {

-				super.createControls(parent);

-				this.treeViewer.setComparator(new ViewerComparator(new StringComparator()));//should always be string element

-			}

-		};

-		selector.setLabelProvider(labelProvider);

-

-		IStaticContentProvider provider = editedAxisManager.createPossibleAxisContentProvider(true);

-		if(provider != null) {

-			selector.setContentProvider(new FlattenableRestrictedFilteredContentProvider((IRestrictedContentProvider)provider, selector));

-

-			final DisplayedAxisSelectorDialog dialog = new DisplayedAxisSelectorDialog(Display.getDefault().getActiveShell(), selector, dialogTitle, true, false, -1);

-			boolean displayCheckBox = editedAxisProvider instanceof ISlaveAxisProvider;

-			dialog.setDisplayCheckBox(displayCheckBox);

-			boolean checkboxValue = secondAxisProvider instanceof IMasterAxisProvider && ((IMasterAxisProvider)secondAxisProvider).isDisconnectSlave();

-			if(displayCheckBox) {

-				dialog.setCheckBoxValues(checkBoxMessage, dialogCheckBoxTootip, checkboxValue);

-			}

-

-			dialog.setInformationDialogValues(Messages.NattableModelManager_DisconnectAxisManagerInformationDialogTitle, dialogQuestion);

-			dialog.setLabelProvider(labelProvider);

-			dialog.setInitialElementSelections(new ArrayList<Object>(editedAxisManager.getAllManagedAxis()));

-

-			int open = dialog.open();

-			if(open == Window.OK) {

-				Collection<Object> existingColumns = editedAxisManager.getAllManagedAxis();

-				ArrayList<Object> checkedColumns = new ArrayList<Object>();

-				checkedColumns.addAll(Arrays.asList(dialog.getResult()));

-

-				ArrayList<Object> columnsToAdd = new ArrayList<Object>(checkedColumns);

-				columnsToAdd.removeAll(existingColumns);

-				CompoundCommand compoundCommand = new CompoundCommand("Update Existing Axis Command"); //$NON-NLS-1$

-				if(columnsToAdd.size() > 0) {

-					Command addAxisElementCommand = null;

-					if(isEditingColumns) {

-						addAxisElementCommand = getAddColumnElementCommand(columnsToAdd);

-					} else {

-						addAxisElementCommand = getAddRowElementCommand(columnsToAdd);

-					}

-					compoundCommand.append(addAxisElementCommand);

-				}

-

-				ArrayList<Object> axisToDestroy = new ArrayList<Object>(existingColumns);

-				axisToDestroy.removeAll(checkedColumns);

-				if(axisToDestroy.size() > 0) {

-					Command destroyAxisElementCommand = null;

-					if(isEditingColumns) {

-						destroyAxisElementCommand = getDestroyColumnElementCommand(axisToDestroy);

-					} else {

-						destroyAxisElementCommand = getDestroyRowElementCommand(axisToDestroy);

-					}

-					compoundCommand.append(destroyAxisElementCommand);

-				}

-

-				final boolean newState = dialog.isChecked();

-				if(displayCheckBox && checkboxValue != newState) {

-					final TransactionalEditingDomain domain = (TransactionalEditingDomain)getTableEditingDomain();

-					final IEditCommandRequest request = new SetRequest(domain, secondAxisProvider, NattableaxisproviderPackage.eINSTANCE.getIMasterAxisProvider_DisconnectSlave(), newState);

-					final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(secondAxisProvider);

-					compoundCommand.append(new GMFtoEMFCommandWrapper(commandProvider.getEditCommand(request)));

-				}

-

-				if(!compoundCommand.isEmpty()) {

-					getContextEditingDomain().getCommandStack().execute(compoundCommand);

-					updateToggleActionState();

-				}

-			}

-		} else {

-			MessageDialog.openInformation(Display.getDefault().getActiveShell(), Messages.NattableModelManager_CreateDestroyAxis, Messages.NattableModelManager_ActionNotYetSupported);

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openCreateDestroyRowsManagerDialog()

-	 * 

-	 */

-	@Override

-	public void openCreateDestroyRowsManagerDialog() {

-		openCreateDestroyAxisManagerDialog(false);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openCreateDestroyColumnsManagerDialog()

-	 * 

-	 */

-	public void openCreateDestroyColumnsManagerDialog() {

-		openCreateDestroyAxisManagerDialog(true);

-	}

-

-	public void sortColumnsByName(final boolean alphabeticOrder) {

-		this.columnManager.sortAxisByName(alphabeticOrder, this.natTable.getConfigRegistry());

-	}

-

-

-	public void sortRowsByName(final boolean alphabeticOrder) {

-		this.rowManager.sortAxisByName(alphabeticOrder, this.natTable.getConfigRegistry());

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getVerticalAxisProvider()

-	 * 

-	 * @return

-	 */

-	public AbstractAxisProvider getVerticalAxisProvider() {

-		if(getTable().isInvertAxis()) {

-			return getTable().getCurrentRowAxisProvider();

-		} else {

-			return getTable().getCurrentColumnAxisProvider();

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getHorizontalAxisProvider()

-	 * 

-	 * @return

-	 */

-	public AbstractAxisProvider getHorizontalAxisProvider() {

-		if(getTable().isInvertAxis()) {

-			return getTable().getCurrentColumnAxisProvider();

-		} else {

-			return getTable().getCurrentRowAxisProvider();

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canEditColumnHeader(int)

-	 * 

-	 * @param evaluationContext

-	 * @return

-	 */

-	public boolean canEditColumnHeader(final NatEventData evaluationContext) {

-		return this.columnManager.canEditAxisHeader(evaluationContext);

-	}

-

-	/***

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canEditRowHeader(org.eclipse.nebula.widgets.nattable.ui.NatEventData)

-	 * 

-	 * @param eventData

-	 * @return

-	 */

-	@Override

-	public boolean canEditRowHeader(NatEventData evaluationContext) {

-		return this.rowManager.canEditAxisHeader(evaluationContext);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openEditRowAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData)

-	 * 

-	 * @param event

-	 */

-	public void openEditRowAliasDialog(NatEventData event) {

-		this.rowManager.openEditAxisAliasDialog(event, event.getNatTable().getRowIndexByPosition(event.getRowPosition()));

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openEditColumnAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData)

-	 * 

-	 * @param event

-	 */

-	public void openEditColumnAliasDialog(NatEventData event) {

-		this.columnManager.openEditAxisAliasDialog(event, event.getNatTable().getColumnIndexByPosition(event.getColumnPosition()));

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getColumnAxisManager()

-	 * 

-	 * @return

-	 */

-	@Override

-	public IAxisManager getColumnAxisManager() {

-		return this.columnManager;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getRowAxisManager()

-	 * 

-	 * @return

-	 */

-	@Override

-	public IAxisManager getRowAxisManager() {

-		return this.rowManager;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
deleted file mode 100644
index e3e98cb6f7f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*****************************************************************************

- * 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.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.messages.messages"; //$NON-NLS-1$

-

-	public static String CompositeAxisManager_DestroyAxisCommand;

-

-	public static String AbstractAxisManager_InputDialogMessage;

-

-	public static String AbstractAxisManager_InputDialogTitle;

-

-	public static String AbstractCreateNattableEditorHandler_EnterTheNameForTheNewTable;

-

-	public static String AbstractCreateNattableEditorHandler_PapyrusTableCreation;

-

-	public static String AbstractTableHandler_CurrentEditorCantBeFound;

-

-	public static String AxisManagerFactory_AxisManagerClassCantBeLoaded;

-

-	public static String AxisManagerFactory_TheClassCantBeInstanciated;

-

-	public static String CompositeAxisManager_AddAxisCommand;

-

-	public static String DeleteNatTableContextAdvice_DestroyNattableCommand;

-

-	public static String EditConfiguration_ConfigurationFactoryNotFound;

-

-	public static String EditConfiguration_ConfigurationNotFound;

-

-	public static String EditConfiguration_DeclarationNotYetSupported;

-

-	public static String EditConfiguration_FactoryHandlesElementButDoesntProvideEditor;

-

-	public static String EObjectManager_AddAxisElement;

-

-	public static String NattableConfigurationRegistry_ConfigurationNotFound;

-

-	public static String NattableConfigurationRegistry_NoTesterForThisConfiguration;

-

-	public static String NattableConfigurationRegistry_NoTypeForAConfiguration;

-

-	public static String NattableConfigurationRegistry_ResourceEmpty;

-

-	public static String NattableConfigurationRegistry_SeveralConfigurationsWithTheSameType;

-

-	public static String NattableConfigurationRegistry_TableConfigurationNotFound;

-

-	public static String NattableConfigurationRegistry_TesterNotFound;

-

-	public static String NattableConfigurationRegistry_TesterNotManager;

-

-	public static String NattableModelManager_ActionNotYetSupported;

-

-	public static String NattableModelManager_AddColumnCommand;

-

-	public static String NattableModelManager_AddRowCommand;

-

-	public static String NattableModelManager_AtLeastOfOneTheAxisManagerMustBeAMaster;

-

-	public static String NattableModelManager_CreateDestroyAxis;

-

-	public static String NattableModelManager_DisableTheAutomaticAdditionOfColumnsWhenARowIsAdded;

-

-	public static String NattableModelManager_DisableTheAutomaticAdditionOfRowsWhenAColumnIsAdded;

-

-	public static String NattableModelManager_DisconnectAxisManagerCheckBoxMessage;

-

-	public static String NattableModelManager_DisconnectAxisManagerCheckBoxTooltip;

-

-	public static String NattableModelManager_DisconnectAxisManagerInformationDialogMessage;

-

-	public static String NattableModelManager_DisconnectAxisManagerInformationDialogTitle;

-

-	public static String NattableModelManager_DisconnectColumnAxisManager;

-

-	public static String NattableModelManager_DisconnectColumnAxisManagerMessageInInformationDialog;

-

-	public static String NattableModelManager_DisconnectThisAxisManager;

-

-	public static String NattableModelManager_EditingDomainNotFound;

-

-	public static String NattableModelManager_SelectColumns;

-

-	public static String NattableModelManager_SelectRows;

-

-	public static String NattableModelManager_ServiceRegistryNotFound;

-

-	public static String NattableModelManager_SwitchLinesAndColumns;

-

-	public static String NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticColumnAddition;

-

-	public static String NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticRowAddition;

-

-	public static String PrintTableHandler_PrintCantBeDone;

-

-	public static String PrintTableHandler_TablePrint;

-

-	public static String TableLabelProvider_ErrorGettingIconForTable;

-

-	public static String TableTesterRegistry_SeveralTesterAreRegisteredWithTheSameId;

-

-	public static String TableTesterRegistry_TheClassCantBeLoaded;

-

-	public static String ICellManager_NotAvailable;

-

-	public static String AbstractUMLTableEFacetEditor_UMLTableCreationErrorMessage;

-

-	public static String ColumnsToShowDialog_AdditionalFeatures;

-

-	public static String ColumnsToShowDialog_AdvancedMode;

-

-	public static String ColumnsToShowDialog_default_columns;

-

-	public static String ColumnsToShowDialog_DeselectAll;

-

-	public static String ColumnsToShowDialog_DeselectAllAvailableAdditionalFeatures;

-

-	public static String ColumnsToShowDialog_DeselecteAllAvailableFeatures;

-

-	public static String ColumnsToShowDialog_DeselectedAll;

-

-	public static String ColumnsToShowDialog_DirectFeatures;

-

-	public static String ColumnsToShowDialog_SelecColumnsToShow;

-

-	public static String ColumnsToShowDialog_SelectAll;

-

-	public static String ColumnsToShowDialog_SelectAllAvailableAdditionalFeatures;

-

-	public static String ColumnsToShowDialog_SelectAllAvailablesFeatures;

-

-	public static String ColumnsToShowDialog_ShowAllPossibilities;

-

-	public static String PasteInPapyrusTableCommandProvider_0;

-

-	public static String PasteInPapyrusTableCommandProvider_1;

-

-	public static String PasteInPapyrusTableCommandProvider_2;

-

-	public static String PasteInPapyrusTableCommandProvider_3;

-

-	public static String PasteInPapyrusTableCommandProvider_Pasting;

-

-	public static String PasteInPapyrusTableCommandProvider_PastingInTable;

-

-	public static String PasteInPapyrusTableCommandProvider_ProblemsToSetPropertyValue;

-

-	public static String PasteInPapyrusTableCommandProvider_ProblemToApplyStereotype;

-

-	public static String PasteInPapyrusTableCommandProvider_ProblemToSetStereotypeValue;

-

-	public static String PasteInPapyrusTableCommandProvider_RequiredStereotypeCantBeFound;

-

-	public static String PasteInPapyrusTableCommandProvider_RequiredStereotypeNotApplied;

-

-	public static String PasteInPapyrusTableCommandProvider_StereotypePropertyCantBeResolved;

-

-	public static String PasteInPapyrusTableCommandProvider_TheEnumerationLiteralCantBeFound;

-

-	public static String PasteInPapyrusTableCommandProvider_TheStereotypeCantBeApplied;

-

-	public static String PasteInPapyrusTableCommandProvider_TheTextCantBeMappedOnAnExistingElement;

-

-	public static String PasteInTableHandler_PasteCancelled;

-

-	public static String PasteInTableHandler_PasteCreation;

-

-	public static String PasteInTableHandler_ThePasteCommandCantBeExecuted;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
deleted file mode 100644
index cc6af72e69a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
+++ /dev/null
@@ -1,82 +0,0 @@
-AbstractAxisManager_InputDialogMessage=The real name for the header is: \n\t %s \n \n Alias:

-AbstractAxisManager_InputDialogTitle=Edit Header Alias Dialog

-AbstractCreateNattableEditorHandler_EnterTheNameForTheNewTable=Enter the name for the new table

-AbstractCreateNattableEditorHandler_PapyrusTableCreation=Papyrus Table Creation

-AbstractTableHandler_CurrentEditorCantBeFound=Current Editor can't be found

-AxisManagerFactory_AxisManagerClassCantBeLoaded=The AxisManager registered with the id {0} can't be loaded

-AxisManagerFactory_TheClassCantBeInstanciated=The class {0} can't be instanciated

-CompositeAxisManager_AddAxisCommand=Add Axis Command

-DeleteNatTableContextAdvice_DestroyNattableCommand=Destroy NatTables command

-EditConfiguration_ConfigurationFactoryNotFound=I can't find config factory for {0}

-EditConfiguration_ConfigurationNotFound=I can't find configuration for {0}

-EditConfiguration_DeclarationNotYetSupported=The declaration of celleditor on cell is not yet supported

-EditConfiguration_FactoryHandlesElementButDoesntProvideEditor=The factory {0} handles the element {1} but doesn't provide CellEditor

-EObjectManager_AddAxisElement=Add Axis Element

-NattableConfigurationRegistry_ConfigurationNotFound=Configuration can't be found

-NattableConfigurationRegistry_NoTesterForThisConfiguration=no tester for this configuration

-NattableConfigurationRegistry_NoTypeForAConfiguration=TableConfiguration in {0} has no type.

-NattableConfigurationRegistry_ResourceEmpty=The resource {0} is empty.

-NattableConfigurationRegistry_SeveralConfigurationsWithTheSameType=Several configuration are registered with the same type : {0}. We keep only the first one

-NattableConfigurationRegistry_TableConfigurationNotFound=TableConfiguration not found in {0}.

-NattableConfigurationRegistry_TesterNotFound=tester notfound

-NattableConfigurationRegistry_TesterNotManager=tester not managed

-NattableModelManager_ActionNotYetSupported=This action is not yet supported

-NattableModelManager_AddColumnCommand=Add column command

-CompositeAxisManager_DestroyAxisCommand=Destroy column command

-NattableModelManager_AddRowCommand=Add rows command

-NattableModelManager_AtLeastOfOneTheAxisManagerMustBeAMaster=At least one of the AxisManager must be a Master

-NattableModelManager_CreateDestroyAxis=Create / Destroy Axis

-NattableModelManager_DisableTheAutomaticAdditionOfColumnsWhenARowIsAdded=Disable the automatic addition of columns when a row is added

-NattableModelManager_DisableTheAutomaticAdditionOfRowsWhenAColumnIsAdded=Disable the automatic addition of rows when a column is added

-NattableModelManager_DisconnectAxisManagerCheckBoxMessage=Disconnect this axis manager

-NattableModelManager_DisconnectAxisManagerCheckBoxTooltip=Disable the automatic addition of columns when a row is added.

-NattableModelManager_DisconnectAxisManagerInformationDialogMessage=The checkbox '%s' has not been checked, so the next row addition could be followed by a columns addition, ignoring your current selection of columns. \n \n Do you want to continue?

-NattableModelManager_DisconnectAxisManagerInformationDialogTitle=Axis Selection Question

-NattableModelManager_DisconnectColumnAxisManager=Disable the automatic addition of rows when a column is added.

-NattableModelManager_DisconnectColumnAxisManagerMessageInInformationDialog=The checkbox '%s' has not been checked, so the next row addition could be followed by a columns addition, ignoring your current selection of rows. \n\n Do you want to continue?

-NattableModelManager_DisconnectThisAxisManager=Disconnect this axis manager

-NattableModelManager_EditingDomainNotFound=EditingDomain not found

-NattableModelManager_SelectColumns=Select Columns

-NattableModelManager_SelectRows=Select Rows

-NattableModelManager_ServiceRegistryNotFound=ServiceRegistry not found

-NattableModelManager_SwitchLinesAndColumns=Switch Lines and Columns

-NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticColumnAddition=The checkbox '%s' has not been checked, so the next row addition could be followed by a columns addition, ignoring your current selection of columns. Do you want to continue?

-NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticRowAddition=The checkbox '%s' has not been checked, so the next column addition could be followed by a rows addition, ignoring your current selection of rows. Do you want to continue?

-PrintTableHandler_PrintCantBeDone=Print can't be done

-PrintTableHandler_TablePrint=Table Print

-TableLabelProvider_ErrorGettingIconForTable=Error getting icon image for tables: 

-TableTesterRegistry_SeveralTesterAreRegisteredWithTheSameId=Several classes are registered for the id {0}

-TableTesterRegistry_TheClassCantBeLoaded=Class registrered with id {0} can't be loaded

-ICellManager_NotAvailable=N/A

-AbstractUMLTableEFacetEditor_UMLTableCreationErrorMessage=A UML Table can't be created with a non-UML element as context ({0})

-ColumnsToShowDialog_AdditionalFeatures=Additional Features

-ColumnsToShowDialog_AdvancedMode=Advanced Mode

-ColumnsToShowDialog_default_columns=Default Columns

-ColumnsToShowDialog_DeselectAll=Deselect All

-ColumnsToShowDialog_DeselectAllAvailableAdditionalFeatures=Deselect all available additional features.

-ColumnsToShowDialog_DeselecteAllAvailableFeatures=Deselect all available features.

-ColumnsToShowDialog_DeselectedAll=Deselect All

-ColumnsToShowDialog_DirectFeatures=Direct Features

-ColumnsToShowDialog_SelecColumnsToShow=Select the columns to show

-ColumnsToShowDialog_SelectAll=Select All

-ColumnsToShowDialog_SelectAllAvailableAdditionalFeatures=Select all available additional features.

-ColumnsToShowDialog_SelectAllAvailablesFeatures=Select all available features.

-ColumnsToShowDialog_ShowAllPossibilities=Show all possibilities

-PasteInPapyrusTableCommandProvider_0=The String {0} is not valid to create a {1}.

-PasteInPapyrusTableCommandProvider_1=Paste Command In FlowPort Table

-PasteInPapyrusTableCommandProvider_2=Create Paste Action

-PasteInPapyrusTableCommandProvider_3=Launch Progress Monitor Dialog

-PasteInPapyrusTableCommandProvider_Pasting=Pasting 

-PasteInPapyrusTableCommandProvider_PastingInTable=Pasting in Table

-PasteInPapyrusTableCommandProvider_ProblemsToSetPropertyValue=Problems to set properties value

-PasteInPapyrusTableCommandProvider_ProblemToApplyStereotype=Problems to apply stereotype

-PasteInPapyrusTableCommandProvider_ProblemToSetStereotypeValue=Problems to set stereotype properties value

-PasteInPapyrusTableCommandProvider_RequiredStereotypeCantBeFound=Stereotype {0} required by the column can' be found

-PasteInPapyrusTableCommandProvider_RequiredStereotypeNotApplied=The required stereotype {0} is not applied on the element {1}.

-PasteInPapyrusTableCommandProvider_StereotypePropertyCantBeResolved=The stereotype property called by {0} can't be resolved

-PasteInPapyrusTableCommandProvider_TheEnumerationLiteralCantBeFound=The enumeration literal {0} can't be found

-PasteInPapyrusTableCommandProvider_TheStereotypeCantBeApplied=The stereotype {0} can' be applied on {1}

-PasteInPapyrusTableCommandProvider_TheTextCantBeMappedOnAnExistingElement=The text {0} can't be mapped to an existing element

-PasteInTableHandler_PasteCancelled=Paste Action Canceled

-PasteInTableHandler_PasteCreation=Paste creation...

-PasteInTableHandler_ThePasteCommandCantBeExecuted=The paste command can't be executed

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java
deleted file mode 100644
index 3eec5419698..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.nattableconfiguration;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IContributor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.util.URI;

-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.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-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.tester.ITableTester;

-import org.eclipse.papyrus.infra.nattable.tester.TableTesterRegistry;

-

-

-public class NattableConfigurationRegistry {

-

-	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.configuration"; //$NON-NLS-1$

-

-	public static final String FILE_ATTRIBUTE = "file"; //$NON-NLS-1$

-

-	/**

-	 * the table configuration identified by the type of the table

-	 */

-	private Map<String, TableConfiguration> configsURI;

-

-	private ResourceSet resourceSet;

-

-	public static final NattableConfigurationRegistry INSTANCE = new NattableConfigurationRegistry();

-

-	private NattableConfigurationRegistry() {

-		//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 URI getConfigurationURI(final String tableType) {

-		initFields();

-		return this.configsURI.get(tableType).eResource().getURI();

-	}

-

-	private void initFields() {

-		if(this.configsURI == null) {

-			this.configsURI = new HashMap<String, TableConfiguration>();

-			final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-			this.resourceSet = new ResourceSetImpl();

-			for(final IConfigurationElement iConfigurationElement : configElements) {

-				Object file = iConfigurationElement.getAttribute(FILE_ATTRIBUTE);

-				IContributor contributor = iConfigurationElement.getContributor();

-				//we build the uri for the file

-				URI uri = URI.createPlatformPluginURI(contributor.getName() + "/" + file.toString(), true);//$NON-NLS-1$ //FIXME : maybe a best way?

-				Resource res = this.resourceSet.getResource(uri, true);

-				if(res.getContents().size() > 0) {

-					EObject first = res.getContents().get(0);

-					if(first instanceof TableConfiguration) {

-						String type = ((TableConfiguration)first).getType();

-						if(type != null) {

-							if(!this.configsURI.containsKey(type)) {

-								this.configsURI.put(type, (TableConfiguration)first);

-							} else {

-								Activator.log.warn(String.format(Messages.NattableConfigurationRegistry_SeveralConfigurationsWithTheSameType, type));

-							}

-						} else {

-							Activator.log.warn(String.format(Messages.NattableConfigurationRegistry_NoTypeForAConfiguration, uri));

-						}

-					} else {

-						Activator.log.warn(String.format(Messages.NattableConfigurationRegistry_TableConfigurationNotFound, uri));

-					}

-				} else {

-					Activator.log.warn(String.format(Messages.NattableConfigurationRegistry_ResourceEmpty, uri));

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param tableType

-	 *        the table type to create

-	 * @param tableContext

-	 *        the table context

-	 * @return

-	 *         a status {@link IStatus#OK} when wa can create the table or {@link IStatus#ERROR} if not

-	 */

-	public IStatus canCreateTable(final String tableType, final Object tableContext) {

-		initFields();

-		TableConfiguration config = this.configsURI.get(tableType);

-		if(config != null) {

-			AbstractTableTester tester = config.getCreationTester();

-			if(tester instanceof JavaTableTester) {

-				final String testerId = ((JavaTableTester)tester).getTester();

-				final ITableTester myTester = TableTesterRegistry.INSTANCE.getTableTester(testerId);

-				if(myTester != null) {

-					return myTester.isAllowed(tableContext);

-				} else {

-					new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_TesterNotFound);

-				}

-			} else if(tester == null) {

-				return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_NoTesterForThisConfiguration);

-			} else {

-				new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_TesterNotManager);

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.NattableConfigurationRegistry_ConfigurationNotFound);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
deleted file mode 100644
index f75ce5c193d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************

- * 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;

-

-

-public class CustomCheckBoxPainter extends CheckBoxPainter {

-

-	@Override

-	public ICellPainter getCellPainterAt(int x, int y, ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			TextPainter painter = new TextPainter();

-			return painter.getCellPainterAt(x, y, cell, gc, bounds, configRegistry);

-		}

-		return super.getCellPainterAt(x, y, cell, gc, bounds, configRegistry);

-	}

-

-	@Override

-	public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			TextPainter painter = new TextPainter();

-			painter.paintCell(cell, gc, bounds, configRegistry);

-			return;

-		}

-		super.paintCell(cell, gc, bounds, configRegistry);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
deleted file mode 100644
index 62a47b46891..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************

- * 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.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-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 {

-

-	/**

-	 * 

-	 * @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) {

-		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

-		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);

-		return provider.getImage(contextElement);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java
deleted file mode 100644
index 3734fbaca7b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-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.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.graphics.Image;

-

-

-public abstract class AbstractNattableCellLabelProvider implements IFilteredLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 * 

-	 */

-	public boolean accept(Object element) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 * 

-	 */

-	public Image getImage(Object element) {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 * 

-	 */

-	public String getText(Object element) {

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 * 

-	 * @param listener

-	 *        always throws {@link UnsupportedOperationException}

-	 */

-	public void addListener(ILabelProviderListener listener) {

-		//		throw new UnsupportedOperationException();

-	}

-

-	public void dispose() {

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 * 

-	 * @param element

-	 * @param property

-	 * @return

-	 *         false

-	 */

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 * 

-	 * @param listener

-	 *        always throws {@link UnsupportedOperationException}

-	 */

-	public void removeListener(ILabelProviderListener listener) {

-		//		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param registry

-	 * @return

-	 *         the row object for this cell

-	 */

-	protected Object getRowObject(final ILayerCell cell, final IConfigRegistry registry) {

-		int rowIndex = cell.getRowIndex();

-		ITableAxisElementProvider provider = getAxisContentProvider(registry);

-		return provider.getRowElement(rowIndex);

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param registry

-	 * @return

-	 *         the column object for this cell

-	 */

-	protected Object getColumnObject(final ILayerCell cell, final IConfigRegistry registry) {

-		int columnIndex = cell.getColumnIndex();

-		ITableAxisElementProvider provider = getAxisContentProvider(registry);

-		return provider.getColumnElement(columnIndex);

-	}

-

-	/**

-	 * 

-	 * @param registry

-	 * @return

-	 *         the table axis element provider

-	 */

-	protected ITableAxisElementProvider getAxisContentProvider(final IConfigRegistry registry) {

-		return registry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-	}

-

-	/**

-	 * 

-	 * @param registry

-	 * @return

-	 *         the label provider service

-	 */

-	protected LabelProviderService getLabelProviderService(final IConfigRegistry registry) {

-		return registry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-	}

-

-	/**

-	 * 

-	 * @param element

-	 *        a label provider context element

-	 * @return

-	 *         the configuration to use for this element

-	 */

-	protected ILabelProviderConfiguration getLabelConfiguration(final LabelProviderCellContextElement element) {

-		ILabelProviderConfiguration conf = null;

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-		LabelStack labels = element.getCell().getConfigLabels();

-		if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-			conf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(manager.getTable());

-		} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-			conf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(manager.getTable());

-		}

-		return conf;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java
deleted file mode 100644
index 6041dc1c87f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * The generic label provider for the cells

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class GenericCellLabelProvider extends AbstractNattableCellLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 *         <code>true</code> if the element is an instance of {@link ILabelProviderContextElement} and if the cell represents an

-	 *         {@link EStructuralFeature} of an {@link EObject}

-	 */

-	@Override

-	public boolean accept(Object element) {

-		return element instanceof ILabelProviderCellContextElement;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

-		final IConfigRegistry registry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		Object value = cell.getDataValue();

-		String label = ""; //$NON-NLS-1$

-		final LabelProviderService service = getLabelProviderService(registry);

-		if(value instanceof Collection<?>) {

-			Iterator<?> iter = ((Collection<?>)value).iterator();

-			label += Constants.BEGIN_OF_COLLECTION;

-			while(iter.hasNext()) {

-				Object current = iter.next();

-				label += service.getLabelProvider(current).getText(current);

-				if(iter.hasNext()) {

-					label += Constants.SEPARATOR;

-				}

-			}

-			label += Constants.END_OF_COLLECTION;

-		} else {

-			label = service.getLabelProvider(value).getText(value);

-		}

-		return label;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
deleted file mode 100644
index 07d38e2a9ac..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

-

-/**

- * 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 ILabelProviderContextElement) {

-			Object object = ((ILabelProviderContextElement)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 ((ILabelProviderContextElement)element).getObject().toString();

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
deleted file mode 100644
index 350bf3061e7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

-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.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * The LabelProvider used in the table

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider {

-

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	protected String getColumnHeaderLabel(final ILayerCell cell, final IConfigRegistry configRegistry) {

-		return getLabel(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	protected String getRowHeaderLabel(final ILayerCell cell, final IConfigRegistry configRegistry) {

-		return getLabel(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		String labelProviderContextId = null;

-		if(element instanceof IAxis) {

-			labelProviderContextId = ((IAxis)element).getManager().getLabelProviderContext();

-			return getLabel(cell, configRegistry, labelProviderContextId);

-		}

-		final LabelStack labels = getLabelStack(cell, configRegistry);

-		if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-			return getColumnHeaderLabel(cell, configRegistry);

-		} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-			return getRowHeaderLabel(cell, configRegistry);

-		} else if(labels.hasLabel(GridRegion.BODY)) {

-			return getBodyLabel(cell, configRegistry);

-		}

-		Object value = cell.getDataValue();

-		if(value != null) {

-			return value.toString();

-		}

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	protected LabelStack getLabelStack(final ILayerCell cell, final IConfigRegistry configRegistry) {

-		LabelStack labels = cell.getConfigLabels();

-		if(labels.getLabels().isEmpty()) {

-			//in case of copy, we don't have the label

-			final INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			labels = ((AbstractNattableWidgetManager)manager).getGridLayer().getBodyLayer().getConfigLabelsByPosition(cell.getColumnPosition(), cell.getRowPosition());

-		}

-		return labels;

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @param labelproviderContext

-	 * @return

-	 */

-	protected String getLabel(final ILayerCell cell, final IConfigRegistry configRegistry, final String labelproviderContext) {

-		String txt = ""; //$NON-NLS-1$

-		Object value = cell.getDataValue();

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

-		LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		ILabelProvider labelProvider = serv.getLabelProvider(labelproviderContext, contextElement);

-		if(labelProvider != null) {

-			txt = labelProvider.getText(contextElement);

-		} else {

-			labelProvider = serv.getLabelProvider(labelproviderContext, value);

-			if(labelProvider != null) {

-				txt = labelProvider.getText(value);

-			} else {

-				labelProvider = serv.getLabelProvider(value);

-				if(labelProvider != null) {

-					txt = labelProvider.getText(value);

-				} else {

-					txt = value.toString();

-				}

-			}

-		}

-		return txt;

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	protected String getBodyLabel(final ILayerCell cell, final IConfigRegistry configRegistry) {//Body or data grid?

-		return getLabel(cell, configRegistry, Constants.BODY_LABEL_PROVIDER_CONTEXT);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		return element instanceof ILabelProviderCellContextElement;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

-			final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

-			Object object = ((ILabelProviderContextElement)element).getObject();

-			String labelProviderContextId = null;

-			final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-			if(object instanceof IAxis) {

-				labelProviderContextId = ((IAxis)object).getManager().getLabelProviderContext();

-				return getImage(cell, configRegistry, labelProviderContextId);

-			}

-			final LabelStack labels = getLabelStack(cell, configRegistry);

-			if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-				return getColumnHeaderImage(cell, configRegistry);

-			} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-				return getRowHeaderImage(cell, configRegistry);

-			} else if(labels.hasLabel(GridRegion.BODY)) {

-				return getBodyLabelImage(cell, configRegistry);

-			}

-		}

-		return super.getImage(element);

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	private Image getBodyLabelImage(ILayerCell cell, IConfigRegistry configRegistry) {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 *        the cell

-	 * @param configRegistry

-	 *        the config registry

-	 * @return

-	 *         the image to display in the row

-	 */

-	private Image getRowHeaderImage(ILayerCell cell, IConfigRegistry configRegistry) {

-		return getImage(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 *        the cell

-	 * @param configRegistry

-	 *        the config registry

-	 * @param labelproviderContext

-	 *        the context to used to find the label provider

-	 * @return

-	 */

-	private Image getImage(ILayerCell cell, IConfigRegistry configRegistry, String labelproviderContext) {

-		Image image = null;

-		Object value = cell.getDataValue();

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

-		LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		ILabelProvider labelProvider = serv.getLabelProvider(labelproviderContext, contextElement);

-		if(labelProvider != null) {

-			image = labelProvider.getImage(contextElement);

-		} else {

-			labelProvider = serv.getLabelProvider(labelproviderContext, value);

-			if(labelProvider != null) {

-				image = labelProvider.getImage(value);

-			} else {

-				labelProvider = serv.getLabelProvider(value);

-				if(labelProvider != null) {

-					image = labelProvider.getImage(value);

-				}

-			}

-		}

-		return image;

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 *        the cell

-	 * @param configRegistry

-	 *        the config registry

-	 * @return

-	 *         the image to display for the header

-	 */

-	private Image getColumnHeaderImage(ILayerCell cell, IConfigRegistry configRegistry) {

-		return getImage(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.java
deleted file mode 100644
index 73db2e6b047..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * 

- * This labelprovider provides icon and text for tables to display them in treeviewer

- * 

- */

-public class TableLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	@Override

-	public String getText(Object table) {

-		Object el = table;

-		if(table instanceof IAdaptable) {

-			el = ((IAdaptable)table).getAdapter(EObject.class);

-		}

-		if(el != null && el instanceof Table) {

-			return ((Table)el).getName();

-		}

-		return ""; //$NON-NLS-1$

-	}

-

-	@Override

-	public Image getImage(Object table) {

-		if(table instanceof IAdaptable) {

-			table = ((IAdaptable)table).getAdapter(EObject.class);

-		}

-		if(table instanceof Table) {

-			final String iconPath = ((Table)table).getTableConfiguration().getIconPath();

-			if(iconPath != null) {

-				return Activator.getDefault().getImage(iconPath);

-			}

-		}

-		return null;

-	}

-

-	public boolean accept(Object table) {

-		Object el = table;

-		if(table instanceof IAdaptable) {

-			el = EMFHelper.getEObject(table);

-		}

-		if(el != null) {

-			return el instanceof Table;

-		}

-

-		return false;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java
deleted file mode 100644
index 8c6ab4fa7f4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************

- * 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.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.nebula.widgets.nattable.layer.ILayerListener;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.nebula.widgets.nattable.selection.event.CellSelectionEvent;

-import org.eclipse.nebula.widgets.nattable.selection.event.ColumnSelectionEvent;

-import org.eclipse.ui.services.IDisposable;

-

-

-public class TableSelectionProvider implements ISelectionProvider, IDisposable {

-

-	private SelectionLayer selectionLayer;

-

-	private final ILayerListener selectionListener;

-

-	private ISelection currentSelection;

-

-	private final List<ISelectionChangedListener> listeners;

-

-	public TableSelectionProvider(final SelectionLayer selectionLayer) {

-		this.selectionLayer = selectionLayer;

-		this.selectionListener = new ILayerListener() {

-

-			public void handleLayerEvent(final ILayerEvent event) {

-				calculateAndStoreNewSelection(event);

-			}

-		};

-		this.selectionLayer.addLayerListener(this.selectionListener);

-		this.currentSelection = new StructuredSelection();

-		this.listeners = new ArrayList<ISelectionChangedListener>();

-	}

-

-

-	public void addSelectionChangedListener(final ISelectionChangedListener listener) {

-		this.listeners.add(listener);

-

-	}

-

-	public ISelection getSelection() {

-		return this.currentSelection;

-	}

-

-	public void removeSelectionChangedListener(final ISelectionChangedListener listener) {

-		this.listeners.remove(listener);

-	}

-

-	public synchronized void setSelection(final ISelection selection) {

-		this.currentSelection = selection;

-		final SelectionChangedEvent event = new SelectionChangedEvent(this, this.currentSelection);

-		for(final ISelectionChangedListener current : this.listeners) {

-			current.selectionChanged(event);

-		}

-	}

-

-	protected/* synchronized */void calculateAndStoreNewSelection(final ILayerEvent event) {

-		if(event instanceof ColumnSelectionEvent) {

-			final ColumnSelectionEvent e = (ColumnSelectionEvent)event;

-			final int[] positions = this.selectionLayer.getSelectedColumnPositions();

-			//			System.out.println(positions);

-			//			this.selectionLayer.

-

-		} else if(event instanceof CellSelectionEvent) {

-			final CellSelectionEvent e = (CellSelectionEvent)event;

-			final int colPos = e.getColumnPosition();

-			final int rowPos = e.getRowPosition();

-			//			System.out.println(colPos);

-			//			System.out.println(rowPos);

-			int i = 0;

-			i++;

-			final ILayerCell cell = this.selectionLayer.getCellByPosition(colPos, rowPos);

-			if(cell != null) {

-				final Object value = cell.getDataValue();

-

-				if(value != null) {

-					if(value instanceof Collection<?>) {

-						final List<Object> selection = new ArrayList<Object>();

-						final Iterator<?> iter = ((Collection<?>)value).iterator();

-						while(iter.hasNext()) {

-							final Object current = iter.next();

-							selection.add(current);

-							setSelection(new StructuredSelection(selection));

-						}

-					} else {

-						setSelection(new StructuredSelection(value));

-					}

-

-				} else {

-					setSelection(new StructuredSelection());

-				}

-			} else {

-				setSelection(new StructuredSelection());

-			}

-

-		}

-		//must be done in a new thread?

-	}

-

-

-	public void dispose() {

-		this.selectionLayer.removeLayerListener(this.selectionListener);

-		this.selectionLayer = null;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
deleted file mode 100644
index d0589d99080..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************

- * 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

-	 */

-	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

-	 */

-	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

-	 */

-	public void mouseUp(NatTable natTable, MouseEvent event) {

-		if(this.manager.canMoveColumns()) {

-			super.mouseUp(natTable, event);

-		}

-

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
deleted file mode 100644
index 06d894cf01a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************

- * 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

-	 */

-	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

-	 */

-	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

-	 */

-	public void mouseUp(NatTable natTable, MouseEvent event) {

-		if(this.manager.canMoveColumns()) {

-			super.mouseUp(natTable, event);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
deleted file mode 100644
index 1fb16f6a614..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
deleted file mode 100644
index 6044e85572e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
deleted file mode 100644
index 08bc630f184..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
deleted file mode 100644
index a851c1d647e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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;

-

-

-	/**

-	 * 

-	 * 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;

-	}

-

-	/**

-	 * Compare 2 {@link IAxis}

-	 * 

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param arg0

-	 * @param arg1

-	 * @return

-	 */

-	public int compare(IAxis arg0, IAxis arg1) {

-		LabelProviderService serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		Object element0 = arg0.getElement();

-		Object element1 = arg1.getElement();

-		final String str1 = getText(serv, element0).replaceAll(AxisUtils.REGEX, "");//we keep only words characters (letters + numbers) + whitespace

-		final String str2 = getText(serv, element1).replaceAll(AxisUtils.REGEX, "");

-		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

-	 */

-	protected String getText(final LabelProviderService serv, final Object obj) {

-		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-		return provider.getText(new LabelProviderContextElement(obj, this.configRegistry));

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java
deleted file mode 100644
index 43336f76a4b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Common methods for axis management

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class AxisUtils {

-

-	private AxisUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * This regex allows to find all word character (letters + numbers)+ the whitespace

-	 */

-	public static final String REGEX = "[^\\w\\s]";

-

-	/**

-	 * This methods avoid to duplicate these some lines

-	 * 

-	 * @param axisElement

-	 *        an axis element

-	 * @return

-	 *         if the axis element is a String returns it and if the axis element is an instance of IdAxis, returns the String represented by this

-	 *         axis

-	 */

-	public static final String getPropertyId(final Object axisElement) {

-		String id = null;

-		if(axisElement instanceof IdAxis) {

-			id = ((IdAxis)axisElement).getElement();

-		} else if(axisElement instanceof String) {

-			id = (String)axisElement;

-		}

-		return id;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        a table

-	 * @return

-	 *         the axismanager used for rows, managing the invert axis

-	 */

-	public static final AbstractAxisProvider getAxisProviderUsedForRows(final Table table) {

-		AbstractAxisProvider provider = table.getCurrentRowAxisProvider();

-		if(table.isInvertAxis()) {

-			provider = table.getCurrentColumnAxisProvider();

-		}

-		return provider;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        a table

-	 * @return

-	 *         the axismanager used for columns, managing the invert axis

-	 */

-	public static final AbstractAxisProvider getAxisProviderUsedForColumns(final Table table) {

-		AbstractAxisProvider provider = table.getCurrentColumnAxisProvider();

-		if(table.isInvertAxis()) {

-			provider = table.getCurrentRowAxisProvider();

-		}

-		return provider;

-	}

-

-	/**

-	 * 

-	 * @param manager

-	 *        a table manager

-	 * @return

-	 *         the axismanager used for rows, managing the invert axis

-	 */

-	public static final AbstractAxisProvider getAxisProviderUsedForRows(final INattableModelManager manager) {

-		return getAxisProviderUsedForRows(manager.getTable());

-	}

-

-	/**

-	 * 

-	 * @param manager

-	 *        a table manager

-	 * @return

-	 *         the axismanager used for columns, managing the invert axis

-	 */

-	public static final AbstractAxisProvider getAxisProviderUsedForColumns(final INattableModelManager manager) {

-		return getAxisProviderUsedForColumns(manager.getTable());

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
deleted file mode 100644
index 69ecc790412..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-

-

-public class Constants {

-

-	private Constants() {

-		//to prevent instanciation

-	}

-

-	public static final String BEGIN_OF_COLLECTION = "["; //$NON-NLS-1$

-

-	public static final String END_OF_COLLECTION = "]"; //$NON-NLS-1$

-

-	public static final String SEPARATOR = ", "; //$NON-NLS-1$

-

-	public static final String NOT_AVALAIBLE = "N/A";//$NON-NLS-1$

-

-	public static final String INFINITY_STAR = "*";

-

-	public static final String INFINITE_MINUS_ONE = "-1";

-

-	/**

-	 * the context to use to find the label provider used to display values in cells and headers

-	 */

-	public static final String TABLE_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.full.labelprovider";

-

-	/**

-	 * the context to use to find the label provider used to display values in the headers

-	 */

-	public static final String HEADER_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.header.labelprovider";

-

-	/**

-	 * the context to use to find the label provider used to display values in the body of the table

-	 */

-

-	public static final String BODY_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.body.labelprovider";

-

-	/**

-	 * The name of the parameter used for the sort command

-	 */

-	public static final String SORT_COMMAND_PARAMETER = "org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter";

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
deleted file mode 100644
index 3d05729d3c7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-

-/**

- * 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, mananing 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, mananing 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 getAbstractHeaderAxisConfigurationUsedInTable(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, mananing the inversion of the axis or <code>null</code> if we aer

-	 *         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 getColumnAbstractHeaderAxisUsedInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = getColumnAbstractHeaderAxisInTable(table);

-		if(config == null) {

-			config = getColumnAbstractHeaderAxisInTableConfiguration(table);

-		}

-		assert config != null;

-		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 config != null;

-		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());

-		return conf;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElement.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElement.java
deleted file mode 100644
index 9bad7e4eab5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElement.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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 ILabelProviderCellContextElement extends ILabelProviderContextElement {

-

-	/**

-	 * 

-	 * @return

-	 *         the cell for which we want the label

-	 */

-	public ILayerCell getCell();

-

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElement.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElement.java
deleted file mode 100644
index b26f24b308a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElement.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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 ILabelProviderContextElement {

-

-	/**

-	 * 

-	 * @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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
deleted file mode 100644
index 411f23cb9dd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElement.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElement.java
deleted file mode 100644
index 06c9917d1ff..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElement.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-

-/**

- * 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 LabelProviderCellContextElement extends LabelProviderContextElement implements ILabelProviderCellContextElement {

-

-	/**

-	 * the cell

-	 */

-	private ILayerCell cell;

-

-	/**

-	 * *

-	 * Constructor.

-	 * 

-	 * @param cell

-	 *        the cell for which we want the label/icon, ...

-	 * @param registry

-	 *        the registry used by nattable

-	 */

-	public LabelProviderCellContextElement(ILayerCell cell, final IConfigRegistry registry) {

-		super(cell.getDataValue(), registry);

-		this.cell = cell;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement#getCell()

-	 * 

-	 * @return

-	 */

-	public ILayerCell getCell() {

-		return this.cell;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.utils.LabelProviderContextElement#getObject()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Object getObject() {

-		return this.cell.getDataValue();

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElement.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElement.java
deleted file mode 100644
index 511950f9365..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElement.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.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 LabelProviderContextElement implements ILabelProviderContextElement {

-

-	private IConfigRegistry registry;

-

-	private Object object;

-

-	/**

-	 * *

-	 * Constructor.

-	 * 

-	 * @param object

-	 *        the cell for which we want the label/icon, ...

-	 * @param registry

-	 *        the registry used by nattable

-	 */

-	public LabelProviderContextElement(final Object object, final IConfigRegistry registry) {

-		this.object = object;

-		this.registry = registry;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement#getConfigRegistry()

-	 * 

-	 * @return

-	 */

-	public IConfigRegistry getConfigRegistry() {

-		return this.registry;

-	}

-

-	/**

-	 * 

-	 * @return

-	 */

-	public Object getObject() {

-		return this.object;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
deleted file mode 100644
index 9013e936401..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*****************************************************************************

- * 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;

-		return message;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java
deleted file mode 100644
index 262a8d7c924..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.style.ConfigAttribute;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * This class references the keys registered in the ConfigRegistry of the table to facilitate access to these objects

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class NattableConfigAttributes {

-

-	private NattableConfigAttributes() {

-		//to prevent instaciantionF

-	}

-

-	/**

-	 * The config attribute used to register the table model manager

-	 * 

-	 * <ul>

-	 * <li>To store it :

-	 * <code> configRegistry.registerConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, YOUR_NATTABLE_MODEL_MANAGER, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);</code>

-	 * </li>

-	 * <li>To get it : <code></code></li>

-	 * </ul>

-	 */

-	public static final ConfigAttribute<INattableModelManager> NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE = new ConfigAttribute<INattableModelManager>();//FIXME : try to create a new interface to limit the access of the method

-

-	/**

-	 * The config attribute used to register the label provider service

-	 * 

-	 * <ul>

-	 * <li>To store it :

-	 * <code> configRegistry.registerConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, YOUR_LABEL_PROVER_SERVICE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);</code>

-	 * </li>

-	 * <li>To get it : <code></code></li>

-	 * LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE,

-	 * DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-	 * </ul>

-	 */

-	public static final ConfigAttribute<LabelProviderService> LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE = new ConfigAttribute<LabelProviderService>();

-

-	/**

-	 * Id used to register the label provider service

-	 */

-	public static final String LABEL_PROVIDER_SERVICE_ID = "label_provider_service_id";

-

-	/**

-	 * Id used to registrer the table model manager

-	 */

-	public static final String NATTABLE_MODEL_MANAGER_ID = "nattable_model_manager_id";

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java
deleted file mode 100644
index e270e277d18..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************

- * 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.core.expressions.PropertyTester;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

-

-

-public class NattableWidgetPropertyTester extends PropertyTester {

-

-	public static final String IS_NATTABLE_WIDGET = "isNattableWidget"; //$NON-NLS-1$

-

-	private static final String HAS_FEATURE_ROW_HEADER_CONFIGURATION = "hasFeatureRowHeaderConfiguration"; //$NON-NLS-1$

-

-	private static final String HAS_FEATURE_COLUMN_HEADER_CONFIGURATION = "hasFeatureColumnHeaderConfiguration"; //$NON-NLS-1$

-

-	private static final String HAS_SLAVE_ROWS_AXIS_PROVIDER = "hasSlaveRowAxisProvider"; //$NON-NLS-1$

-

-	private static final String HAS_SLAVE_COLUMNS_AXIS_PROVIDER = "hasSlaveColumnAxisProvider"; //$NON-NLS-1$

-

-	private static final String CAN_INVERT_AXIS = "canInvertAxis";//$NON-NLS-1$

-

-	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		final INattableModelManager manager = getNattableModelManager();

-		if(IS_NATTABLE_WIDGET.equals(property) && expectedValue instanceof Boolean) {

-			return expectedValue.equals(manager != null);

-		}

-		if(manager != null && expectedValue instanceof Boolean) {

-			if(HAS_FEATURE_ROW_HEADER_CONFIGURATION.equals(property)) {

-				LabelConfigurationManagementUtils.getRowFeatureLabelConfigurationInTable(manager.getTable());

-				return expectedValue.equals(LabelConfigurationManagementUtils.hasRowFeatureLabelConfiguration(manager.getTable()));

-			} else if(HAS_FEATURE_COLUMN_HEADER_CONFIGURATION.equals(property)) {

-				return expectedValue.equals(LabelConfigurationManagementUtils.hasColumnFeatureLabelConfiguration(manager.getTable()));

-			} else if(HAS_SLAVE_COLUMNS_AXIS_PROVIDER.equals(property)) {

-				return expectedValue.equals(AxisUtils.getAxisProviderUsedForColumns(manager) instanceof ISlaveAxisProvider);

-			} else if(HAS_SLAVE_ROWS_AXIS_PROVIDER.equals(property)) {

-				return expectedValue.equals(AxisUtils.getAxisProviderUsedForRows(manager) instanceof ISlaveAxisProvider);

-			} else if(CAN_INVERT_AXIS.equals(property)) {

-				return expectedValue.equals(manager.canInvertAxis());

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current nattable model manager or <code>null</code> if not found

-	 */

-	protected INattableModelManager getNattableModelManager() {

-		final IWorkbenchPart current = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().getActivePart();

-		if(current != null) {

-			return (INattableModelManager)current.getAdapter(INattableModelManager.class);

-		}

-		return null;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
deleted file mode 100644
index 585d6832f0e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  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

-	 */

-	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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
deleted file mode 100644
index 965031183c5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************

- * 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/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java
deleted file mode 100644
index 4756fd67690..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class TableHelper {

-

-	private TableHelper() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param configuration

-	 *        the configuration used to create the table

-	 * @return

-	 *         the table created from this configuration

-	 */

-	public static final Table createTable(final TableConfiguration configuration) {

-		return createTable(configuration, null);

-	}

-

-	/**

-	 * 

-	 * @param configuration

-	 *        the configuration used to create the table

-	 * @param context

-	 *        the context of the table

-	 * @return

-	 *         the table created from these parameters

-	 */

-	public static final Table createTable(final TableConfiguration configuration, final EObject context) {

-		return createTable(configuration, null, null);

-	}

-

-	/**

-	 * 

-	 * @param configuration

-	 *        the configuration used to create the table

-	 * @param context

-	 *        the context of the table

-	 * @param name

-	 *        the name for the table

-	 * @return

-	 *         the table created from these parameters

-	 */

-	public static final Table createTable(final TableConfiguration configuration, final EObject context, final String name) {

-		return createTable(configuration, null, null, null);

-	}

-

-	/**

-	 * 

-	 * @param configuration

-	 *        the configuration used to create the table

-	 * @param context

-	 *        the context of the table

-	 * @param name

-	 *        the name for the table

-	 * @param description

-	 *        the description for the table

-	 * @return

-	 *         the table created from these parameters

-	 */

-	public static final Table createTable(final TableConfiguration configuration, final EObject context, final String name, final String description) {

-		assert configuration != null;

-

-		Table table = NattableFactory.eINSTANCE.createTable();

-		table.setTableConfiguration(configuration);

-		table.setDescription(description);

-		table.setName(name);

-		table.setContext(context);

-

-		//the configuration always provides axis provider

-		AbstractAxisProvider rowProvider = configuration.getDefaultRowAxisProvider();

-		rowProvider = EcoreUtil.copy(rowProvider);

-

-		AbstractAxisProvider columnProvider = configuration.getDefaultColumnAxisProvider();

-		columnProvider = EcoreUtil.copy(columnProvider);

-

-		table.setCurrentRowAxisProvider(rowProvider);

-		table.setCurrentColumnAxisProvider(columnProvider);

-		table.getRowAxisProvidersHistory().add(rowProvider);

-		table.getColumnAxisProvidersHistory().add(columnProvider);

-		return table;

-

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
deleted file mode 100644
index f4c7cbd554e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*****************************************************************************

- * 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() {

-

-			public void widgetSelected(SelectionEvent e) {

-				runAction();

-			}

-

-			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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.classpath b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.project b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.project
deleted file mode 100644
index 2952f2f0fd5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.nattable.allocation.config</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
deleted file mode 100644
index 005caf6823f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation.config;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.config.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.sysml;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.0",
- org.eclipse.papyrus.sysml.nattable.menu;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.uml.nattable.menu;bundle-version="0.10.0",
- org.eclipse.papyrus.sysml.service.types;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core,
- org.eclipse.core.expressions
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index c2d71593bc5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation.config

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = SysML Allocation Table Configuration (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/about.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/build.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/build.properties
deleted file mode 100644
index bc8ea3707a0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               build.properties,\

-               icons/,\

-               resources/,\

-               about.html,\

-               OSGI-INF/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.gif b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.gif
deleted file mode 100644
index 6d9e22c5df6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png
deleted file mode 100644
index 761ea002323..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
deleted file mode 100644
index 9fd55c981be..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.tester">

-      <tester

-            class="org.eclipse.papyrus.sysml.nattable.allocation.config.tester.TableAllocationCreationTester"

-            id="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtablecreationtester">

-      </tester>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.configuration">

-      <configuration

-            file="resources/allocation.nattableconfiguration">

-      </configuration>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.sysml.nattable.allocation.config.handler.CreateAllocateHandler"

-            commandId="org.eclipse.papyrus.sysml.service.types.AllocateCreateCommand">

-         <activeWhen>

-            <with

-                  variable="selection">

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtable.propertyTester.isAllocationTable"

-                     value="true">

-               </test>

-            </with>

-         </activeWhen>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.core.expressions.propertyTesters">

-      <propertyTester

-            class="org.eclipse.papyrus.sysml.nattable.allocation.config.tester.AllocationPropertyTester"

-            id="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtable.propertyTester"

-            namespace="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtable.propertyTester"

-            properties="isAllocationTable"

-            type="org.eclipse.jface.viewers.IStructuredSelection">

-      </propertyTester>

-   </extension>

-

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration
deleted file mode 100644
index 932fd8f0929..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table is used to display SysML Allocation" name="AllocationTable" type="PapyrusSysMLAllocationTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.gif" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtablecreationtester"/>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">

-      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml.nattable.allocate.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Dependency/client"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Dependency/supplier"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-    </axis>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>

-</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java
deleted file mode 100644
index 5138a0ef4e7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.allocation.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.sysml.nattable.allocation.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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java
deleted file mode 100644
index 46b42f09628..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.allocation.config.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.sysml.nattable.menu.handlers.AllocateHandler;

-import org.eclipse.papyrus.uml.nattable.menu.util.TableMenuUtils;

-

-/**

- * This handler allows to create an Allocate object, only if the table is a PapyrusSysMLAllocationTable

- * 

- * @author vl222926

- * 

- */

-public class CreateAllocateHandler extends AllocateHandler {

-

-	/**

-	 * the id used for the Papyrus SysML Allocation Table

-	 */

-	public static final String TABLE_ALLOCATION_TYPE = "PapyrusSysMLAllocationTable"; //$NON-NLS-1$

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.sysml.nattable.menu.handlers.AbstractSysmlNattableCreateCommandHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		Command command = getCommand();

-		boolean isEnabled = command.canExecute();

-		INattableModelManager tableManager = TableMenuUtils.getTableManager(getActiveWorkbenchPart());

-		isEnabled = isEnabled && tableManager.getTable().getTableConfiguration().getType().equals(TABLE_ALLOCATION_TYPE);

-		if(isEnabled) {

-			IElementType newElementType = getElementTypeToCreate();

-			String id = newElementType.getId();

-			isEnabled = tableManager.canCreateRowElement(id);

-		}

-		setBaseEnabled(isEnabled);

-

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/Messages.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/Messages.java
deleted file mode 100644
index 6ed417c2730..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/Messages.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.papyrus.sysml.nattable.allocation.config.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.sysml.nattable.allocation.config.messages.messages"; //$NON-NLS-1$

-

-	public static String TableAllocationCreationTester_NotAnUMLElement;

-

-	public static String TableAllocationCreationTester_OKMessage;

-

-	public static String TableAllocationCreationTester_ProfileNotApplied;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/messages.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/messages.properties
deleted file mode 100644
index 45f52336124..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-TableAllocationCreationTester_NotAnUMLElement=The context is not an UML Element

-TableAllocationCreationTester_OKMessage=The context allows to create an Allocation Table

-TableAllocationCreationTester_ProfileNotApplied=The profile {0} is not applied on the model

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java
deleted file mode 100644
index 69b8c6d62f4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.allocation.config.tester;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.NattableWidgetPropertyTester;

-import org.eclipse.papyrus.sysml.nattable.allocation.config.handler.CreateAllocateHandler;

-

-

-public class AllocationPropertyTester extends NattableWidgetPropertyTester {

-

-	private static final String IS_ALLOCATION_TABLE = "isAllocationTable"; //$NON-NLS-1$

-

-	@Override

-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

-		final INattableModelManager manager = getNattableModelManager();

-		if(manager != null) {

-			if(IS_ALLOCATION_TABLE.equals(property) && expectedValue instanceof Boolean) {

-				return expectedValue.equals(manager.getTable().getTableConfiguration().getType().equals(CreateAllocateHandler.TABLE_ALLOCATION_TYPE));

-			}

-		}

-		return false;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java
deleted file mode 100644
index 40e816f2bcc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.allocation.config.tester;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.nattable.allocation.config.Activator;

-import org.eclipse.papyrus.sysml.nattable.allocation.config.messages.Messages;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-public class TableAllocationCreationTester implements ITableTester {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.tester.ITableTester#isAllowed(java.lang.Object)

-	 * 

-	 * @param context

-	 * @return

-	 */

-	public IStatus isAllowed(Object context) {

-		if(context instanceof Element) {

-			Element el = (Element)context;

-			boolean result = context instanceof Package;

-			if(result) {

-				//doesn't work!

-				final String packageQN = UMLUtil.getProfile(AllocationsPackage.eINSTANCE, el).getQualifiedName();

-				result = result && el.getNearestPackage().getAppliedProfile(packageQN, true) != null;

-				if(result) {

-					return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableAllocationCreationTester_OKMessage);

-				} else {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format(Messages.TableAllocationCreationTester_ProfileNotApplied, packageQN));

-				}

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableAllocationCreationTester_NotAnUMLElement);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.classpath b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.project b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.project
deleted file mode 100644
index 090ef2018bf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.nattable.allocation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
deleted file mode 100644
index aae971dcd61..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 94b8cf21347..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation

-Bundle-Vendor = Eclipse Modeling Language

-Bundle-Name = SysML Allocation Table (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/about.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/build.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/build.properties
deleted file mode 100644
index 7bc4b567268..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               OSGI-INF/,\

-               build.properties

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml
deleted file mode 100644
index 78ba568260e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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 SysML Allocation NatTable Editor"

-            id="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-            name="Create a new Allocation Table">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-            icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.gif">

-      </image>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.sysml.nattable.allocation.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="PapyrusSysMLAllocationTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         id="create.table.menus"

-         name="Create Table Menus"

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="toolbar:org.eclipse.papyrus.infra.nattable.toolbar.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java
deleted file mode 100644
index e7ff72a44a8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.sysml.nattable.allocation;

-

-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.sysml.nattable.allocation"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/.project b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/.project
deleted file mode 100644
index f06918a455a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.nattable.feature</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.FeatureBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.FeatureNature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/build.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/build.properties
deleted file mode 100644
index e1c31fb3a97..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\

-               build.properties,\

-               epl-v10.html,\

-               license.html,\

-               feature.properties

-src.includes = epl-v10.html,\

-               license.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/epl-v10.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/epl-v10.html
deleted file mode 100644
index cb1073a4bad..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/feature.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/feature.properties
deleted file mode 100644
index 3d80ed179fc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/feature.xml b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
deleted file mode 100644
index e7f04605363..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.papyrus.sysml.nattable.feature"

-      label="SysML NatTable Feature"

-      version="0.10.0.qualifier"

-      provider-name="Eclipse Modeling Project">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin

-         id="org.eclipse.papyrus.sysml.nattable"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.sysml.nattable.requirement"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.sysml.nattable.requirement.config"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/license.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/license.html
deleted file mode 100644
index f19c483b9c8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.classpath b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.classpath
deleted file mode 100644
index ed2585fb3f4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.project b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.project
deleted file mode 100644
index 5bfcdd44c46..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.nattable.menu</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
deleted file mode 100644
index f45f148bac0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.menu;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.menu.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.nattable.menu;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.sysml.service.types;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.0",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="0.10.0",
- org.eclipse.core.expressions;bundle-version="3.4.500",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.tools;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.sysml.nattable.menu.handlers
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 0e3374a8431..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.menu

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Menu for the creation of Sysml elements in the tabular editor (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/about.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/build.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/build.properties
deleted file mode 100644
index f701cb1cc0a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.pdoc

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/plugin.pdoc
deleted file mode 100644
index 5e34df8f759..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the context menu for the tabular editor in SysML, with handlers for the creation of SysML model elements">

-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA-LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/plugin.xml
deleted file mode 100644
index 40b9cd04b97..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/plugin.xml
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-<extension point="org.eclipse.ui.handlers">

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ActorPartPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ActorPartCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AllocateHandler" commandId="org.eclipse.papyrus.sysml.service.types.AllocateCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationCompositeHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationCompositeCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationCompositeDirectedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationCompositeDirectedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationNoneHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationNoneCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationNoneDirectedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationNoneDirectedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationSharedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationSharedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationSharedDirectedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationSharedDirectedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.BlockHandler" commandId="org.eclipse.papyrus.sysml.service.types.BlockCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConformHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConformCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConstraintBlockHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConstraintBlockCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConstraintBlockParameterHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConstraintBlockParameterCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConstraintPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConstraintPropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.CopyHandler" commandId="org.eclipse.papyrus.sysml.service.types.CopyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.DeriveReqtHandler" commandId="org.eclipse.papyrus.sysml.service.types.DeriveReqtCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.DimensionHandler" commandId="org.eclipse.papyrus.sysml.service.types.DimensionCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPortHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPortCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_InOutHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_InOutCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_InHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_InCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_OutHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_OutCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_NAHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_NACreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowSpecificationHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowSpecificationCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ItemFlowHandler" commandId="org.eclipse.papyrus.sysml.service.types.ItemFlowCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.PartPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.PartPropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ProblemHandler" commandId="org.eclipse.papyrus.sysml.service.types.ProblemCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.RationaleHandler" commandId="org.eclipse.papyrus.sysml.service.types.RationaleCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ReferencePropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ReferencePropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.RequirementHandler" commandId="org.eclipse.papyrus.sysml.service.types.RequirementCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.SatisfyHandler" commandId="org.eclipse.papyrus.sysml.service.types.SatisfyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.UnitHandler" commandId="org.eclipse.papyrus.sysml.service.types.UnitCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValuePropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValuePropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValueTypeHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValueTypeCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValueType_EnumerationHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValueType_EnumerationCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValueType_PrimitiveTypeHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValueType_PrimitiveTypeCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.VerifyHandler" commandId="org.eclipse.papyrus.sysml.service.types.VerifyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ViewHandler" commandId="org.eclipse.papyrus.sysml.service.types.ViewCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ViewPointHandler" commandId="org.eclipse.papyrus.sysml.service.types.ViewPointCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-</extension>

-

-<extension

-        point="org.eclipse.ui.menus">

-   <menuContribution

-         allPopups="true"

-         locationURI="popup:org.eclipse.ui.popup.any">

-      <menu

-            id="org.eclipse.papyrus.sysml.nattable.create.sysml.menu"

-            label="Create SysML Element">

-         <visibleWhen

-               checkEnabled="false">

-            <with

-                  variable="selection">

-               <test

-                     property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                     value="true">

-               </test>

-            </with>

-         </visibleWhen>

-      </menu>

-   </menuContribution>

-      <menuContribution

-            allPopups="false"

-            class="org.eclipse.papyrus.sysml.nattable.menu.handlers.SysmlNattableCreateMenu"

-            locationURI="popup:org.eclipse.papyrus.sysml.nattable.create.sysml.menu">

-      </menuContribution>

-      

-      

-   </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java
deleted file mode 100644
index 5e6b458563e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateActorPartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActorPart (Property) creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActorPartPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ACTOR_PART_PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if(getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if(reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
-		return emfCommand;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java
deleted file mode 100644
index cd6c240b30d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Allocate creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AllocateHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ALLOCATE;
-	}
-
-
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java
deleted file mode 100644
index 7351afe4c4a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationCompositeDirected creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationCompositeDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java
deleted file mode 100644
index 5decd16389a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationComposite creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationCompositeHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_COMPOSITE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java
deleted file mode 100644
index c1f7afececf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Association creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java
deleted file mode 100644
index ebc0b910a9d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationNoneDirected creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationNoneDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_NONE_DIRECTED;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java
deleted file mode 100644
index 638c915fe26..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationNone creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationNoneHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_NONE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java
deleted file mode 100644
index e0165df25fc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationSharedDirected creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationSharedDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java
deleted file mode 100644
index 99eb5a8c074..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationShared creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationSharedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_SHARED;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java
deleted file mode 100644
index 73f90304e76..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Block creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class BlockHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.BLOCK;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java
deleted file mode 100644
index 6cf23d19dec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Conform creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConformHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONFORM;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java
deleted file mode 100644
index 49675d0492a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConstraintBlock creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConstraintBlockHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONSTRAINT_BLOCK;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java
deleted file mode 100644
index 0591d77c326..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <pre>
- * Command handler for Problem creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConstraintBlockParameterHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if(getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if(reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-
-		String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", ((Element)container).eContents()); //$NON-NLS-1$
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), name));
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
-		return emfCommand;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java
deleted file mode 100644
index 3164d6ae3be..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConstraintProperty creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConstraintPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONSTRAINT_PROPERTY;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java
deleted file mode 100644
index 343496d20db..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Copy creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CopyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.COPY;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java
deleted file mode 100644
index 9fc7ec1aaed..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DeriveReqt creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DeriveReqtHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.DERIVE_REQT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java
deleted file mode 100644
index 013a01ffecd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Dimension creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DimensionHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.DIMENSION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java
deleted file mode 100644
index 27cba566b1a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowPortHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java
deleted file mode 100644
index da01f4d17ea..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_In creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowPort_InHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_IN;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java
deleted file mode 100644
index 16a7e75db13..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_InOut creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowPort_InOutHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_IN_OUT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java
deleted file mode 100644
index b25276930d7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
-
-/**
- * <pre>
- * Command handler for FlowPort non atomic creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowPort_NAHandler extends FlowPortHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if(getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if(reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
-		return emfCommand;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java
deleted file mode 100644
index a6da5639599..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_Out creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowPort_OutHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_OUT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java
deleted file mode 100644
index 3aecc84d251..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowProperty creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PROPERTY;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java
deleted file mode 100644
index 150eafeba16..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowSpecificationHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java
deleted file mode 100644
index 9ef7134d78e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ItemFlow creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ItemFlowHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ITEM_FLOW;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java
deleted file mode 100644
index fe52448851b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Part (Property) creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PartPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.PART_PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if(getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if(reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
-		return emfCommand;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java
deleted file mode 100644
index 2503eaab89a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Problem creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ProblemHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.PROBLEM;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java
deleted file mode 100644
index 3c0347349d3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Rationale creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RationaleHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.RATIONALE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java
deleted file mode 100644
index f64bbe7d052..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateReferenceWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Reference (Property) creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReferencePropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.REFERENCE_PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if(getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if(reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
-		return emfCommand;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java
deleted file mode 100644
index bcc62ea4b78..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Requirement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RequirementHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.REQUIREMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java
deleted file mode 100644
index 3890db13e8d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Satisfy creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SatisfyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.SATISFY;
-	}
-
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java
deleted file mode 100644
index 1ce7e203e44..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Unit creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class UnitHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.UNIT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java
deleted file mode 100644
index 00ef0d806ba..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateValueWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Value (Property) creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ValuePropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if(getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if(reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
-		return emfCommand;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java
deleted file mode 100644
index 26146d4455d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ValueTypeHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java
deleted file mode 100644
index e3be61c44bc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType_Enumeration creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ValueType_EnumerationHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE_ENUMERATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java
deleted file mode 100644
index 606489e01c8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType_PrimitiveType creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ValueType_PrimitiveTypeHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java
deleted file mode 100644
index 4f4db61a51a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Verify creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class VerifyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VERIFY;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java
deleted file mode 100644
index ccbd234f146..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for View creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ViewHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VIEW;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java
deleted file mode 100644
index 3a5011639ba..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ViewPoint creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ViewPointHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VIEW_POINT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java
deleted file mode 100644
index e6bcdeb5749..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu;

-

-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.sysml.nattable.menu"; //$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)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(plugin);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java
deleted file mode 100644
index e54c8af0e48..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.handlers.AbstractSysmlCreateCommandHandler;

-import org.eclipse.papyrus.uml.nattable.menu.util.TableMenuUtils;

-import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;

-

-/**

- * Abstract handler for the creation commands of Sysml elements in the Nattable editor

- * 

- */

-public abstract class AbstractSysmlNattableCreateCommandHandler extends AbstractSysmlCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * 

-	 * Build the create command for an element creation in the selected container.

-	 * The create command is given by the {@link IElementEditService} of selected 

-	 * element.

-	 * 

-	 * @return the composite creation command for current selection

-	 * 

-	 * </pre>

-	 */

-	protected Command buildCommand() {

-		Command createCmd = super.buildCommand();

-		return TableMenuUtils.buildNattableCreationCommand(createCmd, this.createRequest);

-	}

-

-	/**

-	 * Obtain the context of the active table editor.

-	 * 

-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCommandHandler#getCommandContext()

-	 * 

-	 * @return

-	 */

-	protected ICommandContext getCommandContext() {

-		return TableMenuUtils.getTableCommandContext(TableMenuUtils.getTableManager(getActiveWorkbenchPart()));

-

-	}

-

-	/**

-	 * Verify if this handler is currently active and the command can execute. Additionally, verify if this table can add this type of element.

-	 * 

-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	public void setEnabled(Object evaluationContext) {

-		INattableModelManager tableManager = TableMenuUtils.getTableManager(getActiveWorkbenchPart());

-		boolean isEnabled = tableManager.canCreateRowElement(getElementTypeToCreate().getId());

-		if(isEnabled) {

-			//we test the enable of the super implementation

-			super.setEnabled(evaluationContext);

-			isEnabled = super.isEnabled();

-		}

-		setBaseEnabled(isEnabled);

-

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java
deleted file mode 100644
index 47b2c66344c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.papyrus.infra.nattable.utils.NattableWidgetPropertyTester;

-import org.eclipse.papyrus.sysml.service.types.menu.AbstractCreateSysmlChildMenu;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.menus.IContributionRoot;

-import org.eclipse.ui.services.IServiceLocator;

-

-/**

- * Menu contributions for the creation of Sysml elements from the Nattable editor

- */

-public class SysmlNattableCreateMenu extends AbstractCreateSysmlChildMenu {

-

-	private NattableWidgetPropertyTester tester = new NattableWidgetPropertyTester();

-

-	@Override

-	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {

-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

-		if(tester.test(part, NattableWidgetPropertyTester.IS_NATTABLE_WIDGET, null, Boolean.TRUE)) {

-			super.createContributionItems(serviceLocator, additions);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.classpath b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.project b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.project
deleted file mode 100644
index 69098c4874f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.nattable.requirement.config</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
deleted file mode 100644
index 06cb73b83fd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.config;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.config.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.sysml.service.types;bundle-version="0.10.0",
- org.eclipse.papyrus.sysml;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.tools;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 83ebe934457..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.requirement.config

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Nattable Requirement Configuration (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/about.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties
deleted file mode 100644
index 179cd667297..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               configs/,\

-               icons/,\

-               plugin.pdoc,\

-               about.html

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration
deleted file mode 100644
index f3288b393a2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusSysMLRequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.gif" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml.nattable.config.canCreateRequirementTable"/>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">

-      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml.nattable.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.gif b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.gif
deleted file mode 100644
index 91fc98b9a8f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.pdoc
deleted file mode 100644
index dfb917b2aee..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the configuration to use for Requirement Table.">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
deleted file mode 100644
index a5e6ee819dc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.configuration">

-      <configuration

-            file="configs/requirement.nattableconfiguration">

-      </configuration>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.tester">

-      <tester

-            class="org.eclipse.papyrus.sysml.nattable.requirement.tester.RequirementTableTester"

-            id="org.eclipse.papyrus.sysml.nattable.config.canCreateRequirementTable">

-      </tester>

-   </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java
deleted file mode 100644
index 57be7a1d493..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.sysml.nattable.requirement.config;

-

-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.sysml.nattable.requirement.config"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java
deleted file mode 100644
index cda7b97c52d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.requirement.tester;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

-import org.eclipse.papyrus.sysml.nattable.requirement.config.Activator;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * The tester used to know if we can create requirement table

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class RequirementTableTester implements ITableTester {

-

-	private static final IElementMatcher matcher = new RequirementMatcher();

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.tester.ITableTester#isAllowed(java.lang.Object)

-	 * 

-	 * @param context

-	 * @return

-	 */

-	public IStatus isAllowed(Object context) {

-		if(context instanceof Element) {

-			Element el = (Element)context;

-			boolean result = context instanceof Package || matcher.matches(el);

-			if(result) {

-				//doesn't work!

-				final String packageQN = UMLUtil.getProfile(RequirementsPackage.eINSTANCE, el).getQualifiedName();

-				result = result && el.getNearestPackage().getAppliedProfile(packageQN, true) != null;

-				if(result) {

-					return new Status(IStatus.OK, Activator.PLUGIN_ID, "The context allowed to create a Requirement Table");

-				} else {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("The profile {0} is not applied on the model", packageQN));

-				}

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The context is not an UML Element");

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/.classpath b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/.project b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/.project
deleted file mode 100644
index aa9be074768..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.nattable.requirement</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
deleted file mode 100644
index 4f8a17d2e66..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.sysml.service.types;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.sysml;bundle-version="0.10.0",
- org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index ca1b2ad2390..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.requirement

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Nattable Requirement Editor (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/about.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/build.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/build.properties
deleted file mode 100644
index 1961e7848c9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               plugin.pdoc,\

-               about.html,\

-               OSGI-INF/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/plugin.pdoc
deleted file mode 100644
index 42a2e94d98d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the nattable editor for SysML Requirements.">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml
deleted file mode 100644
index 99717f66c32..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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 SysML Requirement NatTable Editor"

-            id="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-            name="Create a new Requirement Table">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.sysml.nattable.requirement.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="PapyrusSysMLRequirementTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         id="create.table.menus"

-         name="Create Table Menus"

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="toolbar:org.eclipse.papyrus.infra.nattable.toolbar.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-            icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.gif">

-      </image>

-   </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java
deleted file mode 100644
index 6b7c089656a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.requirement;

-

-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.sysml.nattable.requirement"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * 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;

-	}

-

-	/*

-	 * (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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/.classpath b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/.project b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/.project
deleted file mode 100644
index 0f56d109391..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.nattable</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
deleted file mode 100644
index 8ce9352f681..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core,
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0",
- org.eclipse.papyrus.sysml.service.types,
- org.eclipse.emf.edit;bundle-version="2.9.0",
- org.eclipse.papyrus.infra.nattable.model,
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.infra.gmfdiag.commands,
- org.eclipse.papyrus.infra.emf
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.sysml.nattable.manager.axis
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 906720c8e66..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = SysML Nattable plugin (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/about.html b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/build.properties b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/build.properties
deleted file mode 100644
index b9407811706..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/plugin.pdoc
deleted file mode 100644
index a492b48727b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides common classes for the sysml nattable.">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/plugin.xml
deleted file mode 100644
index c8f6f79da45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="1700"

-            provider="org.eclipse.papyrus.sysml.nattable.provider.SysMLFlowPortDirectionLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.body.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.cellmanager">

-      <cellManager

-            id="org.eclipse.papyrus.sysml.nattable.common.stereotype.property.cell.manager"

-            manager="org.eclipse.papyrus.sysml.nattable.manager.cell.SysMLStereotypePropertyCellManager"

-            order="250">

-      </cellManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.axismanager">

-      <axisManager

-            id="org.eclipse.papyrus.sysml.nattable.requirement.axis.manager"

-            manager="org.eclipse.papyrus.sysml.nattable.manager.axis.RequirementAxisManager">

-      </axisManager>

-      <axisManager

-            id="org.eclipse.papyrus.sysml.nattable.allocate.axis.manager"

-            manager="org.eclipse.papyrus.sysml.nattable.manager.axis.AllocateAxisManager">

-      </axisManager>

-   </extension>

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java
deleted file mode 100644
index 1c0309b228e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.papyrus.sysml.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.sysml.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)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 * 

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java
deleted file mode 100644
index ad5060bca05..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.manager.axis;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher;

-import org.eclipse.uml2.uml.UMLPackage;

-

-public class AllocateAxisManager extends AbstractSynchronizedOnFeatureAxisManager {//FIXME must inherits from EObjectAxisManager when the listen feature is typed by an EObejct...

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#addContextFeatureValueListener()

-	 * 

-	 */

-	@Override

-	protected void addContextFeatureValueListener() {

-		this.featureListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if(msg.getFeature() == AllocateAxisManager.this.currentListenFeature || msg.getFeature() == UMLPackage.eINSTANCE.getPackage_PackagedElement()) {

-					getTableManager().updateAxisContents(getRepresentedContentProvider());

-				}

-			}

-		};

-		getTableContext().eAdapters().add(this.featureListener);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#dispose()

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		getTableContext().eAdapters().remove(this.featureListener);

-		super.dispose();

-	}

-

-

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		//FIXME : use the same tricks in others AxisManager

-		return ((ISpecializationType)SysMLElementTypes.ALLOCATE).getId().equals(elementId);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#filterObject(java.util.List)

-	 * 

-	 * @param objects

-	 * @return

-	 */

-	@Override

-	protected List<Object> filterObject(final List<?> objects) {

-		final List<Object> interestingObjects = new ArrayList<Object>();

-		final AllocateMatcher matcher = new AllocateMatcher();

-		for(Object object : objects) {

-			if(object instanceof EObject) {

-				if(matcher.matches((EObject)object)) {

-					interestingObjects.add(object);

-				}

-			}

-		}

-		return interestingObjects;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 * 

-	 * @param axisPosition

-	 * @return

-	 */

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		final Object current = getElements().get(axisPosition);

-		if(current instanceof EObjectAxis) {

-			return !EMFHelper.isReadOnly(((EObjectAxis)current).getElement());

-		} else if(current instanceof EObject) {

-			return !EMFHelper.isReadOnly((EObject)current);

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Integer)

-	 * 

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		final Object current = getElements().get(axisPosition);

-		EObject elementToDestroy = null;

-		if(current instanceof EObjectAxis) {

-			elementToDestroy = ((EObjectAxis)current).getElement();

-		} else if(current instanceof EObject) {

-			elementToDestroy = (EObject)current;

-		}

-		if(elementToDestroy != null) {

-			final DestroyElementRequest request = new DestroyElementRequest((TransactionalEditingDomain)getContextEditingDomain(), elementToDestroy, false);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToDestroy);

-			return new GMFtoEMFCommandWrapper(provider.getEditCommand(request));

-		}

-		return null;

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java
deleted file mode 100644
index 4c844c3a353..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.manager.axis;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher;

-import org.eclipse.uml2.uml.UMLPackage;

-

-

-/**

- * AxisManager for SysML Requirements

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class RequirementAxisManager extends AbstractSynchronizedOnFeatureAxisManager {//FIXME must inherits from EObjectAxisManager when the listen feature is typed by an EObejct...

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#addContextFeatureValueListener()

-	 * 

-	 */

-	@Override

-	protected void addContextFeatureValueListener() {

-		this.featureListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if(msg.getFeature() == RequirementAxisManager.this.currentListenFeature || msg.getFeature() == UMLPackage.eINSTANCE.getPackage_PackagedElement()) {

-					getTableManager().updateAxisContents(getRepresentedContentProvider());

-				}

-			}

-		};

-		getTableContext().eAdapters().add(this.featureListener);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#dispose()

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		getTableContext().eAdapters().remove(this.featureListener);

-		super.dispose();

-	}

-

-

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return ((ISpecializationType)SysMLElementTypes.REQUIREMENT).getId().equals(elementId);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#filterObject(java.util.List)

-	 * 

-	 * @param objects

-	 * @return

-	 */

-	@Override

-	protected List<Object> filterObject(final List<?> objects) {

-		final List<Object> interestingObjects = new ArrayList<Object>();

-		final RequirementMatcher matcher = new RequirementMatcher();

-		for(Object object : objects) {

-			if(object instanceof EObject) {

-				if(matcher.matches((EObject)object)) {

-					interestingObjects.add(object);

-				}

-			}

-		}

-		return interestingObjects;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 * 

-	 * @param axisPosition

-	 * @return

-	 */

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		final Object current = getElements().get(axisPosition);

-		if(current instanceof EObjectAxis) {

-			return !EMFHelper.isReadOnly(((EObjectAxis)current).getElement());

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Integer)

-	 * 

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		final Object current = getElements().get(axisPosition);

-		if(current instanceof EObjectAxis) {

-			final EObject element = ((EObjectAxis)current).getElement();

-			final DestroyElementRequest request = new DestroyElementRequest((TransactionalEditingDomain)getContextEditingDomain(), element, false);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(element);

-			return new GMFtoEMFCommandWrapper(provider.getEditCommand(request));

-		}

-		return null;

-	}

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java
deleted file mode 100644
index 0d2b39a6c78..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************

- * 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.sysml.nattable.manager.cell;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;

-import org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher;

-import org.eclipse.papyrus.uml.nattable.manager.cell.StereotypePropertyCellManager;

-import org.eclipse.papyrus.uml.nattable.utils.Constants;

-import org.eclipse.uml2.uml.Port;

-

-/**

- * 

- * This cell manager manages the cell displaying the direction of the FlowPort.

- * If the flowport is not atomic, the cell is not editable and the direction is N/A.

- * 

- */

-public class SysMLStereotypePropertyCellManager extends StereotypePropertyCellManager implements ICellManager {

-

-	/**

-	 * the FlowPort isAtomicMatcher

-	 */

-	private static FlowPortNAMatcher matcher = new FlowPortNAMatcher();

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.cell.manager.StereotypePropertyCellManager#handles(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	@Override

-	public boolean handles(Object obj1, Object obj2) {

-		if(super.handles(obj1, obj2)) {

-			final List<Object> objects = organizeObject(obj1, obj2);

-			if(objects.size() == 2) {

-				final EObject object = (EObject)objects.get(0);

-				if(object instanceof Port) {

-					String propertyQualifiedName = (String)objects.get(1);

-					propertyQualifiedName = propertyQualifiedName.substring(Constants.PROPERTY_OF_STEREOTYPE_PREFIX.length(), propertyQualifiedName.length());

-					return propertyQualifiedName.equals(org.eclipse.papyrus.sysml.nattable.utils.Constants.STEREOTYPE_FLOWPORT_DIRECTION);

-				}

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.manager.cell.manager.StereotypePropertyCellManager#isCellEditable(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	@Override

-	public boolean isCellEditable(Object obj1, Object obj2) {

-		boolean value = super.isCellEditable(obj1, obj2);

-		if(value) {

-			final List<Object> objects = organizeObject(obj1, obj2);

-			if(objects.size() == 2) {

-				final EObject object = (EObject)objects.get(0);

-				if(matcher.matches(object)) {

-					value = false;

-				}

-			}

-		}

-		return value;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
deleted file mode 100644
index e6b0e293fa0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.provider;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-import org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher;

-import org.eclipse.papyrus.uml.nattable.provider.AbstractUMLNattableCellLabelProvider;

-import org.eclipse.uml2.uml.Port;

-

-/**

- * This label provider allows to display N/A for the direction of the FlowPort when its requred!

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class SysMLFlowPortDirectionLabelProvider extends AbstractUMLNattableCellLabelProvider {

-

-	/**

-	 * N/A FlowPort matcher

-	 */

-	private static final FlowPortNAMatcher matcher = new FlowPortNAMatcher();

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(final Object element) {

-		if(element instanceof LabelProviderCellContextElement) {

-			final ILayerCell cell = ((LabelProviderCellContextElement)element).getCell();

-			final IConfigRegistry registry = ((LabelProviderCellContextElement)element).getConfigRegistry();

-			final Object columnObject = getColumnObject(cell, registry);

-			String str = AxisUtils.getPropertyId(columnObject);

-			if(str == null) {

-				final Object rowObject = getRowObject(cell, registry);

-				str = AxisUtils.getPropertyId(rowObject);

-			}

-			if(str != null) {

-				return str.endsWith(org.eclipse.papyrus.sysml.nattable.utils.Constants.STEREOTYPE_FLOWPORT_DIRECTION);

-			}

-		}

-		return false;

-	}

-

-	@Override

-	public String getText(Object element) {

-		final ILayerCell cell = ((LabelProviderCellContextElement)element).getCell();

-		final IConfigRegistry configRegistry = ((LabelProviderCellContextElement)element).getConfigRegistry();

-		final Object rowObject = getRowObject(cell, configRegistry);

-		final Object columObject = getColumnObject(cell, configRegistry);

-		Port port = null;

-		if(rowObject instanceof Port) {

-			port = (Port)rowObject;

-		} else if(columObject instanceof Port) {

-			port = (Port)columObject;

-		}

-		if(port != null && matcher.matches(port)) {

-			return Constants.NOT_AVALAIBLE;

-		}

-		return super.getText(element);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java
deleted file mode 100644
index a9c51896525..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.utils;

-

-

-public class Constants {

-

-	private Constants() {

-		//to prevent instanciation

-	}

-

-

-	/**

-	 * The qualified name of the property direction

-	 */

-	public static final String STEREOTYPE_FLOWPORT_DIRECTION = "SysML::PortAndFlows::FlowPort::direction";

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/.project b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/.project
deleted file mode 100644
index a40675027f9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.feature</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.FeatureBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.FeatureNature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/build.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/build.properties
deleted file mode 100644
index e1c31fb3a97..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\

-               build.properties,\

-               epl-v10.html,\

-               license.html,\

-               feature.properties

-src.includes = epl-v10.html,\

-               license.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/epl-v10.html b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/epl-v10.html
deleted file mode 100644
index cb1073a4bad..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/feature.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/feature.properties
deleted file mode 100644
index 3d80ed179fc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/feature.xml b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/feature.xml
deleted file mode 100644
index 636882831b6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/feature.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.papyrus.uml.nattable.feature"

-      label="UML NatTable Feature"

-      version="0.10.0.qualifier"

-      provider-name="Eclipse Modeling Project">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin

-         id="org.eclipse.papyrus.uml.nattable"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.uml.nattable.generic"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.uml.nattable.generic.config"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.papyrus.uml.nattable.menu"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/license.html b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/license.html
deleted file mode 100644
index f19c483b9c8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.classpath b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.project b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.project
deleted file mode 100644
index 923ca2e8835..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.generic.config</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
deleted file mode 100644
index 2323002af6c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: UML Generic Table Config (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.config;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.config.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.nattable,
- org.eclipse.uml2.uml;bundle-version="4.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/about.html b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/build.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/build.properties
deleted file mode 100644
index 86abf21cc15..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               icons/,\

-               configs/,\

-               about.html

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration
deleted file mode 100644
index c9e78354015..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="The generic table allows to edit all UML elements of your model, dropping them from the ModelExplorer View" name="GenericTable" type="PapyrusGenericTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.gif" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.uml.nattable.tester.isumlelement"/>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.element.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider"/>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider"/>

-</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.gif b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.gif
deleted file mode 100644
index b647c703db4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png
deleted file mode 100644
index 4bec73c4147..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/plugin.xml
deleted file mode 100644
index 075026e20b9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.configuration">

-      <configuration

-            file="configs/generic.nattableconfiguration">

-      </configuration>

-   </extension>

-

-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java
deleted file mode 100644
index 320df5cac03..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic.config/src/org/eclipse/papyrus/uml/nattable/generic/config/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.uml.nattable.generic.config;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.nattable.generic.config"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/.classpath b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/.project b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/.project
deleted file mode 100644
index bff06e5cbd7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.generic</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
deleted file mode 100644
index 363606cc9d3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.0",
- org.eclipse.emf.common,
- org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 33854e98afd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.uml.nattable.generic

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Generic Table for UML (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/about.html b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/build.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/build.properties
deleted file mode 100644
index e9255071473..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               icons/,\

-               plugin.pdoc,\

-               about.html,\

-               OSGI-INF/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/plugin.pdoc
deleted file mode 100644
index b7eb078fb29..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the generic uml tabular editor.">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/plugin.xml
deleted file mode 100644
index 1c0ea6505cf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/plugin.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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 UML Generic NatTable Editor"

-            id="org.eclipse.papyrus.uml.nattable.generic.create.command"

-            name="Create a new Generic Table">

-      </command>

-   </extension>

-   <extension

-         id="create.table.menus"

-         name="Create Table Menus"

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.uml.nattable.generic.create.command"

-               mnemonic="&amp;G"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.uml.nattable.generic.create.command"

-               mnemonic="&amp;G"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="toolbar:org.eclipse.papyrus.infra.nattable.toolbar.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.uml.nattable.generic.create.command"

-               mnemonic="&amp;G"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.uml.nattable.generic.create.command">

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusGenericTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.uml.nattable.generic.create.command"

-            icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.gif">

-      </image>

-   </extension>
-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/src/org/eclipse/papyrus/uml/nattable/generic/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/src/org/eclipse/papyrus/uml/nattable/generic/Activator.java
deleted file mode 100644
index 3f648553716..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/src/org/eclipse/papyrus/uml/nattable/generic/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.generic;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.nattable.generic"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * 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;

-	}

-

-	/*

-	 * (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/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.classpath b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.classpath
deleted file mode 100644
index ed2585fb3f4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.project b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.project
deleted file mode 100644
index 72e7e1a0705..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.menu</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
deleted file mode 100644
index bd0856eb780..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.menu;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.menu.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.0",
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.papyrus.uml.service.types;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.tools;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.uml.nattable.menu,
- org.eclipse.papyrus.uml.nattable.menu.handlers,
- org.eclipse.papyrus.uml.nattable.menu.messages,
- org.eclipse.papyrus.uml.nattable.menu.util
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 3a9734cb108..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.uml.nattable.menu

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Menu contributions for Papyrus Tabular Editors
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/about.html b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/build.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/build.properties
deleted file mode 100644
index 7ff7de30022..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/,\

-           src-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               OSGI-INF/,\

-               plugin.pdoc

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.pdoc
deleted file mode 100644
index 0e71d9ebd32..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the context menu for the tabular editor in UML, with handlers for the creation of UML model elements">

-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA-LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.xml
deleted file mode 100644
index dd93da09f6d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/plugin.xml
+++ /dev/null
@@ -1,2484 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-<extension point= "org.eclipse.ui.handlers">

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AbstractionHandler" commandId="org.eclipse.papyrus.uml.service.types.AbstractionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AcceptCallActionHandler" commandId="org.eclipse.papyrus.uml.service.types.AcceptCallActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AcceptEventActionHandler" commandId="org.eclipse.papyrus.uml.service.types.AcceptEventActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActionExecutionSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.ActionExecutionSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActionInputPinHandler" commandId="org.eclipse.papyrus.uml.service.types.ActionInputPinCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActivityEdgeHandler" commandId="org.eclipse.papyrus.uml.service.types.ActivityEdgeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActivityFinalNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ActivityFinalNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActivityGroupHandler" commandId="org.eclipse.papyrus.uml.service.types.ActivityGroupCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActivityHandler" commandId="org.eclipse.papyrus.uml.service.types.ActivityCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActivityNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ActivityNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActivityParameterNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ActivityParameterNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActivityPartitionHandler" commandId="org.eclipse.papyrus.uml.service.types.ActivityPartitionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ActorHandler" commandId="org.eclipse.papyrus.uml.service.types.ActorCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AddStructuralFeatureValueActionHandler" commandId="org.eclipse.papyrus.uml.service.types.AddStructuralFeatureValueActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AddVariableValueActionHandler" commandId="org.eclipse.papyrus.uml.service.types.AddVariableValueActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AnyReceiveEventHandler" commandId="org.eclipse.papyrus.uml.service.types.AnyReceiveEventCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ArtifactHandler" commandId="org.eclipse.papyrus.uml.service.types.ArtifactCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AssociationBaseHandler" commandId="org.eclipse.papyrus.uml.service.types.AssociationBaseCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AssociationClassHandler" commandId="org.eclipse.papyrus.uml.service.types.AssociationClassCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.AssociationHandler" commandId="org.eclipse.papyrus.uml.service.types.AssociationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.BehavioralFeatureHandler" commandId="org.eclipse.papyrus.uml.service.types.BehavioralFeatureCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.BehavioredClassifierHandler" commandId="org.eclipse.papyrus.uml.service.types.BehavioredClassifierCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.BehaviorExecutionSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.BehaviorExecutionSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.BehaviorHandler" commandId="org.eclipse.papyrus.uml.service.types.BehaviorCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.BroadcastSignalActionHandler" commandId="org.eclipse.papyrus.uml.service.types.BroadcastSignalActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CallActionHandler" commandId="org.eclipse.papyrus.uml.service.types.CallActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CallBehaviorActionHandler" commandId="org.eclipse.papyrus.uml.service.types.CallBehaviorActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CallEventHandler" commandId="org.eclipse.papyrus.uml.service.types.CallEventCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CallOperationActionHandler" commandId="org.eclipse.papyrus.uml.service.types.CallOperationActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CentralBufferNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.CentralBufferNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ChangeEventHandler" commandId="org.eclipse.papyrus.uml.service.types.ChangeEventCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ClassHandler" commandId="org.eclipse.papyrus.uml.service.types.ClassCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ClassifierHandler" commandId="org.eclipse.papyrus.uml.service.types.ClassifierCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ClassifierTemplateParameterHandler" commandId="org.eclipse.papyrus.uml.service.types.ClassifierTemplateParameterCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ClauseHandler" commandId="org.eclipse.papyrus.uml.service.types.ClauseCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ClearAssociationActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ClearAssociationActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ClearStructuralFeatureActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ClearStructuralFeatureActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ClearVariableActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ClearVariableActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CollaborationHandler" commandId="org.eclipse.papyrus.uml.service.types.CollaborationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CollaborationUseHandler" commandId="org.eclipse.papyrus.uml.service.types.CollaborationUseCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CombinedFragmentHandler" commandId="org.eclipse.papyrus.uml.service.types.CombinedFragmentCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CommentHandler" commandId="org.eclipse.papyrus.uml.service.types.CommentCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CommunicationPathHandler" commandId="org.eclipse.papyrus.uml.service.types.CommunicationPathCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ComponentHandler" commandId="org.eclipse.papyrus.uml.service.types.ComponentCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ComponentRealizationHandler" commandId="org.eclipse.papyrus.uml.service.types.ComponentRealizationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConditionalNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ConditionalNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConnectableElementHandler" commandId="org.eclipse.papyrus.uml.service.types.ConnectableElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConnectableElementTemplateParameterHandler" commandId="org.eclipse.papyrus.uml.service.types.ConnectableElementTemplateParameterCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConnectionPointReferenceHandler" commandId="org.eclipse.papyrus.uml.service.types.ConnectionPointReferenceCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConnectorEndHandler" commandId="org.eclipse.papyrus.uml.service.types.ConnectorEndCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConnectorHandler" commandId="org.eclipse.papyrus.uml.service.types.ConnectorCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConsiderIgnoreFragmentHandler" commandId="org.eclipse.papyrus.uml.service.types.ConsiderIgnoreFragmentCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ConstraintHandler" commandId="org.eclipse.papyrus.uml.service.types.ConstraintCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ContinuationHandler" commandId="org.eclipse.papyrus.uml.service.types.ContinuationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ControlFlowHandler" commandId="org.eclipse.papyrus.uml.service.types.ControlFlowCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ControlNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ControlNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CreateLinkActionHandler" commandId="org.eclipse.papyrus.uml.service.types.CreateLinkActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CreateLinkObjectActionHandler" commandId="org.eclipse.papyrus.uml.service.types.CreateLinkObjectActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.CreateObjectActionHandler" commandId="org.eclipse.papyrus.uml.service.types.CreateObjectActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DataStoreNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.DataStoreNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DataTypeHandler" commandId="org.eclipse.papyrus.uml.service.types.DataTypeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DecisionNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.DecisionNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DependencyHandler" commandId="org.eclipse.papyrus.uml.service.types.DependencyCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DeployedArtifactHandler" commandId="org.eclipse.papyrus.uml.service.types.DeployedArtifactCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DeploymentHandler" commandId="org.eclipse.papyrus.uml.service.types.DeploymentCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DeploymentSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.DeploymentSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DeploymentTargetHandler" commandId="org.eclipse.papyrus.uml.service.types.DeploymentTargetCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DestroyLinkActionHandler" commandId="org.eclipse.papyrus.uml.service.types.DestroyLinkActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DestroyObjectActionHandler" commandId="org.eclipse.papyrus.uml.service.types.DestroyObjectActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DestructionOccurrenceSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.DestructionOccurrenceSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DeviceHandler" commandId="org.eclipse.papyrus.uml.service.types.DeviceCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DirectedRelationshipHandler" commandId="org.eclipse.papyrus.uml.service.types.DirectedRelationshipCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DurationConstraintHandler" commandId="org.eclipse.papyrus.uml.service.types.DurationConstraintCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DurationHandler" commandId="org.eclipse.papyrus.uml.service.types.DurationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DurationIntervalHandler" commandId="org.eclipse.papyrus.uml.service.types.DurationIntervalCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.DurationObservationHandler" commandId="org.eclipse.papyrus.uml.service.types.DurationObservationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ElementHandler" commandId="org.eclipse.papyrus.uml.service.types.ElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ElementImportHandler" commandId="org.eclipse.papyrus.uml.service.types.ElementImportCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.EncapsulatedClassifierHandler" commandId="org.eclipse.papyrus.uml.service.types.EncapsulatedClassifierCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.EnumerationHandler" commandId="org.eclipse.papyrus.uml.service.types.EnumerationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.EnumerationLiteralHandler" commandId="org.eclipse.papyrus.uml.service.types.EnumerationLiteralCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.EventHandler" commandId="org.eclipse.papyrus.uml.service.types.EventCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExceptionHandlerHandler" commandId="org.eclipse.papyrus.uml.service.types.ExceptionHandlerCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExecutableNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ExecutableNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExecutionEnvironmentHandler" commandId="org.eclipse.papyrus.uml.service.types.ExecutionEnvironmentCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExecutionOccurrenceSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.ExecutionOccurrenceSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExecutionSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.ExecutionSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExpansionNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ExpansionNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExpansionRegionHandler" commandId="org.eclipse.papyrus.uml.service.types.ExpansionRegionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExpressionHandler" commandId="org.eclipse.papyrus.uml.service.types.ExpressionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExtendHandler" commandId="org.eclipse.papyrus.uml.service.types.ExtendCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExtensionEndHandler" commandId="org.eclipse.papyrus.uml.service.types.ExtensionEndCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExtensionHandler" commandId="org.eclipse.papyrus.uml.service.types.ExtensionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ExtensionPointHandler" commandId="org.eclipse.papyrus.uml.service.types.ExtensionPointCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.FeatureHandler" commandId="org.eclipse.papyrus.uml.service.types.FeatureCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.FinalNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.FinalNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.FinalStateHandler" commandId="org.eclipse.papyrus.uml.service.types.FinalStateCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.FlowFinalNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.FlowFinalNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ForkNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ForkNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.FunctionBehaviorHandler" commandId="org.eclipse.papyrus.uml.service.types.FunctionBehaviorCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.GateHandler" commandId="org.eclipse.papyrus.uml.service.types.GateCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.GeneralizationHandler" commandId="org.eclipse.papyrus.uml.service.types.GeneralizationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.GeneralizationSetHandler" commandId="org.eclipse.papyrus.uml.service.types.GeneralizationSetCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.GeneralOrderingHandler" commandId="org.eclipse.papyrus.uml.service.types.GeneralOrderingCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ImageHandler" commandId="org.eclipse.papyrus.uml.service.types.ImageCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.IncludeHandler" commandId="org.eclipse.papyrus.uml.service.types.IncludeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InformationFlowHandler" commandId="org.eclipse.papyrus.uml.service.types.InformationFlowCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InformationItemHandler" commandId="org.eclipse.papyrus.uml.service.types.InformationItemCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InitialNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.InitialNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InputPinHandler" commandId="org.eclipse.papyrus.uml.service.types.InputPinCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InstanceSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.InstanceSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InstanceValueHandler" commandId="org.eclipse.papyrus.uml.service.types.InstanceValueCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InteractionConstraintHandler" commandId="org.eclipse.papyrus.uml.service.types.InteractionConstraintCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InteractionFragmentHandler" commandId="org.eclipse.papyrus.uml.service.types.InteractionFragmentCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InteractionHandler" commandId="org.eclipse.papyrus.uml.service.types.InteractionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InteractionOperandHandler" commandId="org.eclipse.papyrus.uml.service.types.InteractionOperandCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InteractionUseHandler" commandId="org.eclipse.papyrus.uml.service.types.InteractionUseCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InterfaceHandler" commandId="org.eclipse.papyrus.uml.service.types.InterfaceCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InterfaceRealizationHandler" commandId="org.eclipse.papyrus.uml.service.types.InterfaceRealizationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InterruptibleActivityRegionHandler" commandId="org.eclipse.papyrus.uml.service.types.InterruptibleActivityRegionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.IntervalConstraintHandler" commandId="org.eclipse.papyrus.uml.service.types.IntervalConstraintCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.IntervalHandler" commandId="org.eclipse.papyrus.uml.service.types.IntervalCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.InvocationActionHandler" commandId="org.eclipse.papyrus.uml.service.types.InvocationActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.JoinNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.JoinNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LifelineHandler" commandId="org.eclipse.papyrus.uml.service.types.LifelineCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LinkActionHandler" commandId="org.eclipse.papyrus.uml.service.types.LinkActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LinkEndCreationDataHandler" commandId="org.eclipse.papyrus.uml.service.types.LinkEndCreationDataCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LinkEndDataHandler" commandId="org.eclipse.papyrus.uml.service.types.LinkEndDataCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LinkEndDestructionDataHandler" commandId="org.eclipse.papyrus.uml.service.types.LinkEndDestructionDataCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LiteralBooleanHandler" commandId="org.eclipse.papyrus.uml.service.types.LiteralBooleanCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LiteralIntegerHandler" commandId="org.eclipse.papyrus.uml.service.types.LiteralIntegerCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LiteralNullHandler" commandId="org.eclipse.papyrus.uml.service.types.LiteralNullCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LiteralRealHandler" commandId="org.eclipse.papyrus.uml.service.types.LiteralRealCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LiteralSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.LiteralSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LiteralStringHandler" commandId="org.eclipse.papyrus.uml.service.types.LiteralStringCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LiteralUnlimitedNaturalHandler" commandId="org.eclipse.papyrus.uml.service.types.LiteralUnlimitedNaturalCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.LoopNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.LoopNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ManifestationHandler" commandId="org.eclipse.papyrus.uml.service.types.ManifestationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.MergeNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.MergeNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.MessageEndHandler" commandId="org.eclipse.papyrus.uml.service.types.MessageEndCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.MessageEventHandler" commandId="org.eclipse.papyrus.uml.service.types.MessageEventCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.MessageHandler" commandId="org.eclipse.papyrus.uml.service.types.MessageCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.MessageOccurrenceSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.MessageOccurrenceSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ModelHandler" commandId="org.eclipse.papyrus.uml.service.types.ModelCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.MultiplicityElementHandler" commandId="org.eclipse.papyrus.uml.service.types.MultiplicityElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.NamedElementHandler" commandId="org.eclipse.papyrus.uml.service.types.NamedElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.NamespaceHandler" commandId="org.eclipse.papyrus.uml.service.types.NamespaceCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.NodeHandler" commandId="org.eclipse.papyrus.uml.service.types.NodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ObjectFlowHandler" commandId="org.eclipse.papyrus.uml.service.types.ObjectFlowCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ObjectNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.ObjectNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ObservationHandler" commandId="org.eclipse.papyrus.uml.service.types.ObservationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.OccurrenceSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.OccurrenceSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.OpaqueActionHandler" commandId="org.eclipse.papyrus.uml.service.types.OpaqueActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.OpaqueBehaviorHandler" commandId="org.eclipse.papyrus.uml.service.types.OpaqueBehaviorCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.OpaqueExpressionHandler" commandId="org.eclipse.papyrus.uml.service.types.OpaqueExpressionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.OperationHandler" commandId="org.eclipse.papyrus.uml.service.types.OperationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.OperationTemplateParameterHandler" commandId="org.eclipse.papyrus.uml.service.types.OperationTemplateParameterCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.OutputPinHandler" commandId="org.eclipse.papyrus.uml.service.types.OutputPinCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PackageableElementHandler" commandId="org.eclipse.papyrus.uml.service.types.PackageableElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PackageHandler" commandId="org.eclipse.papyrus.uml.service.types.PackageCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PackageImportHandler" commandId="org.eclipse.papyrus.uml.service.types.PackageImportCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PackageMergeHandler" commandId="org.eclipse.papyrus.uml.service.types.PackageMergeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ParameterableElementHandler" commandId="org.eclipse.papyrus.uml.service.types.ParameterableElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ParameterHandler" commandId="org.eclipse.papyrus.uml.service.types.ParameterCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ParameterSetHandler" commandId="org.eclipse.papyrus.uml.service.types.ParameterSetCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PartDecompositionHandler" commandId="org.eclipse.papyrus.uml.service.types.PartDecompositionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PinHandler" commandId="org.eclipse.papyrus.uml.service.types.PinCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PortHandler" commandId="org.eclipse.papyrus.uml.service.types.PortCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PrimitiveTypeHandler" commandId="org.eclipse.papyrus.uml.service.types.PrimitiveTypeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ProfileApplicationHandler" commandId="org.eclipse.papyrus.uml.service.types.ProfileApplicationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ProfileHandler" commandId="org.eclipse.papyrus.uml.service.types.ProfileCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PropertyHandler" commandId="org.eclipse.papyrus.uml.service.types.PropertyCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ProtocolConformanceHandler" commandId="org.eclipse.papyrus.uml.service.types.ProtocolConformanceCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ProtocolStateMachineHandler" commandId="org.eclipse.papyrus.uml.service.types.ProtocolStateMachineCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ProtocolTransitionHandler" commandId="org.eclipse.papyrus.uml.service.types.ProtocolTransitionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.PseudostateHandler" commandId="org.eclipse.papyrus.uml.service.types.PseudostateCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.QualifierValueHandler" commandId="org.eclipse.papyrus.uml.service.types.QualifierValueCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RaiseExceptionActionHandler" commandId="org.eclipse.papyrus.uml.service.types.RaiseExceptionActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadExtentActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadExtentActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadIsClassifiedObjectActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadIsClassifiedObjectActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadLinkActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadLinkActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadLinkObjectEndActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadLinkObjectEndActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadLinkObjectEndQualifierActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadLinkObjectEndQualifierActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadSelfActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadSelfActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadStructuralFeatureActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadStructuralFeatureActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReadVariableActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReadVariableActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RealizationHandler" commandId="org.eclipse.papyrus.uml.service.types.RealizationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReceptionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReceptionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReclassifyObjectActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReclassifyObjectActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RedefinableElementHandler" commandId="org.eclipse.papyrus.uml.service.types.RedefinableElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RedefinableTemplateSignatureHandler" commandId="org.eclipse.papyrus.uml.service.types.RedefinableTemplateSignatureCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReduceActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReduceActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RefineHandler" commandId="org.eclipse.papyrus.uml.service.types.RefineCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RegionHandler" commandId="org.eclipse.papyrus.uml.service.types.RegionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RelationshipHandler" commandId="org.eclipse.papyrus.uml.service.types.RelationshipCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RemoveStructuralFeatureValueActionHandler" commandId="org.eclipse.papyrus.uml.service.types.RemoveStructuralFeatureValueActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.RemoveVariableValueActionHandler" commandId="org.eclipse.papyrus.uml.service.types.RemoveVariableValueActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ReplyActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ReplyActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.SendObjectActionHandler" commandId="org.eclipse.papyrus.uml.service.types.SendObjectActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.SendSignalActionHandler" commandId="org.eclipse.papyrus.uml.service.types.SendSignalActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.SequenceNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.SequenceNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.SignalEventHandler" commandId="org.eclipse.papyrus.uml.service.types.SignalEventCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.SignalHandler" commandId="org.eclipse.papyrus.uml.service.types.SignalCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.SlotHandler" commandId="org.eclipse.papyrus.uml.service.types.SlotCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StartClassifierBehaviorActionHandler" commandId="org.eclipse.papyrus.uml.service.types.StartClassifierBehaviorActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StartObjectBehaviorActionHandler" commandId="org.eclipse.papyrus.uml.service.types.StartObjectBehaviorActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StateHandler" commandId="org.eclipse.papyrus.uml.service.types.StateCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StateInvariantHandler" commandId="org.eclipse.papyrus.uml.service.types.StateInvariantCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StateMachineHandler" commandId="org.eclipse.papyrus.uml.service.types.StateMachineCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StereotypeHandler" commandId="org.eclipse.papyrus.uml.service.types.StereotypeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StringExpressionHandler" commandId="org.eclipse.papyrus.uml.service.types.StringExpressionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StructuralFeatureActionHandler" commandId="org.eclipse.papyrus.uml.service.types.StructuralFeatureActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StructuralFeatureHandler" commandId="org.eclipse.papyrus.uml.service.types.StructuralFeatureCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StructuredActivityNodeHandler" commandId="org.eclipse.papyrus.uml.service.types.StructuredActivityNodeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.StructuredClassifierHandler" commandId="org.eclipse.papyrus.uml.service.types.StructuredClassifierCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.SubstitutionHandler" commandId="org.eclipse.papyrus.uml.service.types.SubstitutionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TemplateableElementHandler" commandId="org.eclipse.papyrus.uml.service.types.TemplateableElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TemplateBindingHandler" commandId="org.eclipse.papyrus.uml.service.types.TemplateBindingCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TemplateParameterHandler" commandId="org.eclipse.papyrus.uml.service.types.TemplateParameterCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TemplateParameterSubstitutionHandler" commandId="org.eclipse.papyrus.uml.service.types.TemplateParameterSubstitutionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TemplateSignatureHandler" commandId="org.eclipse.papyrus.uml.service.types.TemplateSignatureCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TestIdentityActionHandler" commandId="org.eclipse.papyrus.uml.service.types.TestIdentityActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TimeConstraintHandler" commandId="org.eclipse.papyrus.uml.service.types.TimeConstraintCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TimeEventHandler" commandId="org.eclipse.papyrus.uml.service.types.TimeEventCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TimeExpressionHandler" commandId="org.eclipse.papyrus.uml.service.types.TimeExpressionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TimeIntervalHandler" commandId="org.eclipse.papyrus.uml.service.types.TimeIntervalCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TimeObservationHandler" commandId="org.eclipse.papyrus.uml.service.types.TimeObservationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TraceHandler" commandId="org.eclipse.papyrus.uml.service.types.TraceCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TransitionHandler" commandId="org.eclipse.papyrus.uml.service.types.TransitionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TriggerHandler" commandId="org.eclipse.papyrus.uml.service.types.TriggerCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TypedElementHandler" commandId="org.eclipse.papyrus.uml.service.types.TypedElementCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.TypeHandler" commandId="org.eclipse.papyrus.uml.service.types.TypeCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.UnmarshallActionHandler" commandId="org.eclipse.papyrus.uml.service.types.UnmarshallActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.UsageHandler" commandId="org.eclipse.papyrus.uml.service.types.UsageCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.UseCaseHandler" commandId="org.eclipse.papyrus.uml.service.types.UseCaseCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ValuePinHandler" commandId="org.eclipse.papyrus.uml.service.types.ValuePinCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ValueSpecificationActionHandler" commandId="org.eclipse.papyrus.uml.service.types.ValueSpecificationActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.ValueSpecificationHandler" commandId="org.eclipse.papyrus.uml.service.types.ValueSpecificationCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.VariableActionHandler" commandId="org.eclipse.papyrus.uml.service.types.VariableActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.VariableHandler" commandId="org.eclipse.papyrus.uml.service.types.VariableCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.VertexHandler" commandId="org.eclipse.papyrus.uml.service.types.VertexCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.WriteLinkActionHandler" commandId="org.eclipse.papyrus.uml.service.types.WriteLinkActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.WriteStructuralFeatureActionHandler" commandId="org.eclipse.papyrus.uml.service.types.WriteStructuralFeatureActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-<handler class= "org.eclipse.papyrus.uml.nattable.menu.handlers.WriteVariableActionHandler" commandId="org.eclipse.papyrus.uml.service.types.WriteVariableActionCreateCommand">

-   <activeWhen>

-      <with

-            variable="selection">

-         <test

-               property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-               value="true">

-         </test>

-      </with>

-   </activeWhen></handler>

-</extension>

-

-<extension

-        point="org.eclipse.ui.menus">

-   <menuContribution

-         allPopups="true"

-         locationURI="popup:org.eclipse.ui.popup.any">

-      <menu

-            id="org.eclipse.papyrus.uml.nattable.create.uml.menu"

-            label="Create UML Element">

-         <visibleWhen

-               checkEnabled="false">

-            <with

-                  variable="selection">

-               <test

-                     property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                     value="true">

-               </test>

-            </with>

-         </visibleWhen>

-      </menu>

-   </menuContribution>

-      <menuContribution

-            allPopups="false"

-            class="org.eclipse.papyrus.uml.nattable.menu.handlers.UmlNattableCreateMenu"

-            locationURI="popup:org.eclipse.papyrus.uml.nattable.create.uml.menu">

-      </menuContribution>

-   </extension>
-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractionHandler.java
deleted file mode 100644
index a26f76c9d45..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Abstraction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AbstractionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ABSTRACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptCallActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptCallActionHandler.java
deleted file mode 100644
index 55e12b23ac8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptCallActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AcceptCallAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AcceptCallActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACCEPT_CALL_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptEventActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptEventActionHandler.java
deleted file mode 100644
index 6f19ad01006..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AcceptEventActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AcceptEventAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AcceptEventActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACCEPT_EVENT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionExecutionSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionExecutionSpecificationHandler.java
deleted file mode 100644
index c88ac13f2a6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionExecutionSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActionExecutionSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActionExecutionSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTION_EXECUTION_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionHandler.java
deleted file mode 100644
index 974fdbd4e1e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Action creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionInputPinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionInputPinHandler.java
deleted file mode 100644
index 03b4e3335ec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActionInputPinHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActionInputPin creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActionInputPinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTION_INPUT_PIN;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityEdgeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityEdgeHandler.java
deleted file mode 100644
index 091c705c21d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityEdgeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActivityEdge creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActivityEdgeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTIVITY_EDGE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityFinalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityFinalNodeHandler.java
deleted file mode 100644
index 6496f17b1e2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityFinalNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActivityFinalNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActivityFinalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTIVITY_FINAL_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityGroupHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityGroupHandler.java
deleted file mode 100644
index 4c8b59829d7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityGroupHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActivityGroup creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActivityGroupHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTIVITY_GROUP;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityHandler.java
deleted file mode 100644
index e51d0e73b05..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Activity creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActivityHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTIVITY;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityNodeHandler.java
deleted file mode 100644
index e9602b2d44d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActivityNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActivityNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTIVITY_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityParameterNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityParameterNodeHandler.java
deleted file mode 100644
index 7f2f6088d03..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityParameterNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActivityParameterNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActivityParameterNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTIVITY_PARAMETER_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityPartitionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityPartitionHandler.java
deleted file mode 100644
index c36579662c3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActivityPartitionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ActivityPartition creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActivityPartitionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTIVITY_PARTITION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActorHandler.java
deleted file mode 100644
index 5d5c7aa423a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ActorHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Actor creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ActorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ACTOR;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddStructuralFeatureValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddStructuralFeatureValueActionHandler.java
deleted file mode 100644
index 97baea42f24..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddStructuralFeatureValueActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AddStructuralFeatureValueAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AddStructuralFeatureValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ADD_STRUCTURAL_FEATURE_VALUE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddVariableValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddVariableValueActionHandler.java
deleted file mode 100644
index 0aa07fda815..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AddVariableValueActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AddVariableValueAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AddVariableValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ADD_VARIABLE_VALUE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AnyReceiveEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AnyReceiveEventHandler.java
deleted file mode 100644
index 0d267b66efe..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AnyReceiveEventHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AnyReceiveEvent creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AnyReceiveEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ANY_RECEIVE_EVENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ArtifactHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ArtifactHandler.java
deleted file mode 100644
index 47645cfcddc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ArtifactHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Artifact creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ArtifactHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ARTIFACT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationBaseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationBaseHandler.java
deleted file mode 100644
index 36c500ba472..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationBaseHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationBase creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationBaseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ASSOCIATION_BASE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationClassHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationClassHandler.java
deleted file mode 100644
index ee8684ccc3e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationClassHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationClass creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationClassHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ASSOCIATION_CLASS;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationHandler.java
deleted file mode 100644
index 8c88877a4c7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/AssociationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Association creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class AssociationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ASSOCIATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorExecutionSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorExecutionSpecificationHandler.java
deleted file mode 100644
index aee4704ebc5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorExecutionSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for BehaviorExecutionSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class BehaviorExecutionSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.BEHAVIOR_EXECUTION_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorHandler.java
deleted file mode 100644
index d4ed8e3e563..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehaviorHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Behavior creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class BehaviorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.BEHAVIOR;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioralFeatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioralFeatureHandler.java
deleted file mode 100644
index 2489e48d16d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioralFeatureHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for BehavioralFeature creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class BehavioralFeatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.BEHAVIORAL_FEATURE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioredClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioredClassifierHandler.java
deleted file mode 100644
index 9576dd9979d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BehavioredClassifierHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for BehavioredClassifier creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class BehavioredClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.BEHAVIORED_CLASSIFIER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BroadcastSignalActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BroadcastSignalActionHandler.java
deleted file mode 100644
index 8ddd55f76a5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/BroadcastSignalActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for BroadcastSignalAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class BroadcastSignalActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.BROADCAST_SIGNAL_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallActionHandler.java
deleted file mode 100644
index 486a822eb4d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CallAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CallActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CALL_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallBehaviorActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallBehaviorActionHandler.java
deleted file mode 100644
index af87a91b44b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallBehaviorActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CallBehaviorAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CallBehaviorActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CALL_BEHAVIOR_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallEventHandler.java
deleted file mode 100644
index 6c9d1d9fa1e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallEventHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CallEvent creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CallEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CALL_EVENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallOperationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallOperationActionHandler.java
deleted file mode 100644
index 97beaf6e0d2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CallOperationActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CallOperationAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CallOperationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CALL_OPERATION_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CentralBufferNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CentralBufferNodeHandler.java
deleted file mode 100644
index 9ac3c2e4a8d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CentralBufferNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CentralBufferNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CentralBufferNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CENTRAL_BUFFER_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ChangeEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ChangeEventHandler.java
deleted file mode 100644
index 52bab844476..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ChangeEventHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ChangeEvent creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ChangeEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CHANGE_EVENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassHandler.java
deleted file mode 100644
index b6bbad4627b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Class creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ClassHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CLASS;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierHandler.java
deleted file mode 100644
index 287cc030d88..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Classifier creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CLASSIFIER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierTemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierTemplateParameterHandler.java
deleted file mode 100644
index 3dd4951a232..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClassifierTemplateParameterHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ClassifierTemplateParameter creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ClassifierTemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CLASSIFIER_TEMPLATE_PARAMETER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClauseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClauseHandler.java
deleted file mode 100644
index ddfd90b28ca..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClauseHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Clause creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ClauseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CLAUSE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearAssociationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearAssociationActionHandler.java
deleted file mode 100644
index 12d5e61ab18..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearAssociationActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ClearAssociationAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ClearAssociationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CLEAR_ASSOCIATION_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearStructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearStructuralFeatureActionHandler.java
deleted file mode 100644
index 7e12bf1df88..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearStructuralFeatureActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ClearStructuralFeatureAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ClearStructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CLEAR_STRUCTURAL_FEATURE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearVariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearVariableActionHandler.java
deleted file mode 100644
index 08e62590238..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ClearVariableActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ClearVariableAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ClearVariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CLEAR_VARIABLE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationHandler.java
deleted file mode 100644
index 0686f2c6013..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Collaboration creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CollaborationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.COLLABORATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationUseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationUseHandler.java
deleted file mode 100644
index 84592b1c35d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CollaborationUseHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CollaborationUse creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CollaborationUseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.COLLABORATION_USE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CombinedFragmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CombinedFragmentHandler.java
deleted file mode 100644
index 7344d7b5138..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CombinedFragmentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CombinedFragment creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CombinedFragmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.COMBINED_FRAGMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommentHandler.java
deleted file mode 100644
index 885a6511fb4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Comment creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CommentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.COMMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommunicationPathHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommunicationPathHandler.java
deleted file mode 100644
index 44a0175335a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CommunicationPathHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CommunicationPath creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CommunicationPathHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.COMMUNICATION_PATH;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentHandler.java
deleted file mode 100644
index 3158391ce5f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Component creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ComponentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.COMPONENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentRealizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentRealizationHandler.java
deleted file mode 100644
index ca086f300a1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ComponentRealizationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ComponentRealization creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ComponentRealizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.COMPONENT_REALIZATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConditionalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConditionalNodeHandler.java
deleted file mode 100644
index 02d00b75f83..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConditionalNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConditionalNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConditionalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONDITIONAL_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementHandler.java
deleted file mode 100644
index ba9f6cd97c6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConnectableElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConnectableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONNECTABLE_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementTemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementTemplateParameterHandler.java
deleted file mode 100644
index e5561f9a3e5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectableElementTemplateParameterHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConnectableElementTemplateParameter creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConnectableElementTemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectionPointReferenceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectionPointReferenceHandler.java
deleted file mode 100644
index 34aab1aec25..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectionPointReferenceHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConnectionPointReference creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConnectionPointReferenceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONNECTION_POINT_REFERENCE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorEndHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorEndHandler.java
deleted file mode 100644
index 5b49b7d0c9d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorEndHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConnectorEnd creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConnectorEndHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONNECTOR_END;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorHandler.java
deleted file mode 100644
index 5d4db811e9d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConnectorHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Connector creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConnectorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONNECTOR;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConsiderIgnoreFragmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConsiderIgnoreFragmentHandler.java
deleted file mode 100644
index 7dc8563e229..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConsiderIgnoreFragmentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConsiderIgnoreFragment creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConsiderIgnoreFragmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONSIDER_IGNORE_FRAGMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConstraintHandler.java
deleted file mode 100644
index 6bddc8e20e3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ConstraintHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Constraint creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONSTRAINT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ContinuationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ContinuationHandler.java
deleted file mode 100644
index 777534d58f7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ContinuationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Continuation creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ContinuationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONTINUATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlFlowHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlFlowHandler.java
deleted file mode 100644
index b737cb12dfe..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlFlowHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ControlFlow creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ControlFlowHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONTROL_FLOW;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlNodeHandler.java
deleted file mode 100644
index 11df00389fa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ControlNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ControlNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ControlNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CONTROL_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkActionHandler.java
deleted file mode 100644
index 4b986dce62b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CreateLinkAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CreateLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CREATE_LINK_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkObjectActionHandler.java
deleted file mode 100644
index 3325e7e59cf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateLinkObjectActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CreateLinkObjectAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CreateLinkObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CREATE_LINK_OBJECT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateObjectActionHandler.java
deleted file mode 100644
index 87c213de096..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/CreateObjectActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for CreateObjectAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class CreateObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.CREATE_OBJECT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataStoreNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataStoreNodeHandler.java
deleted file mode 100644
index 2af09f3651b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataStoreNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DataStoreNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DataStoreNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DATA_STORE_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataTypeHandler.java
deleted file mode 100644
index 04cbd9f53d0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DataTypeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DataType creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DataTypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DATA_TYPE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DecisionNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DecisionNodeHandler.java
deleted file mode 100644
index fc894d52899..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DecisionNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DecisionNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DecisionNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DECISION_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DependencyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DependencyHandler.java
deleted file mode 100644
index 225434ed075..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DependencyHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Dependency creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DependencyHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DEPENDENCY;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeployedArtifactHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeployedArtifactHandler.java
deleted file mode 100644
index b7a147c946f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeployedArtifactHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DeployedArtifact creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DeployedArtifactHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DEPLOYED_ARTIFACT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentHandler.java
deleted file mode 100644
index 3942619e527..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Deployment creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DeploymentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DEPLOYMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentSpecificationHandler.java
deleted file mode 100644
index e84a679c883..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DeploymentSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DeploymentSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DEPLOYMENT_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentTargetHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentTargetHandler.java
deleted file mode 100644
index 5011644fd46..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeploymentTargetHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DeploymentTarget creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DeploymentTargetHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DEPLOYMENT_TARGET;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyLinkActionHandler.java
deleted file mode 100644
index 3acb2662764..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyLinkActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DestroyLinkAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DestroyLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DESTROY_LINK_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyObjectActionHandler.java
deleted file mode 100644
index b3f615b9f1d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestroyObjectActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DestroyObjectAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DestroyObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DESTROY_OBJECT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestructionOccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestructionOccurrenceSpecificationHandler.java
deleted file mode 100644
index a3bdf4f2f50..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DestructionOccurrenceSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DestructionOccurrenceSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DestructionOccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DESTRUCTION_OCCURRENCE_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeviceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeviceHandler.java
deleted file mode 100644
index d41cb7cfb07..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DeviceHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Device creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DeviceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DEVICE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DirectedRelationshipHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DirectedRelationshipHandler.java
deleted file mode 100644
index 106ad97fac3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DirectedRelationshipHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DirectedRelationship creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DirectedRelationshipHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DIRECTED_RELATIONSHIP;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationConstraintHandler.java
deleted file mode 100644
index e750990f2e8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationConstraintHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DurationConstraint creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DurationConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DURATION_CONSTRAINT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationHandler.java
deleted file mode 100644
index c7cd870b8f9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Duration creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DurationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DURATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationIntervalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationIntervalHandler.java
deleted file mode 100644
index 3c9641df5f4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationIntervalHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DurationInterval creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DurationIntervalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DURATION_INTERVAL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationObservationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationObservationHandler.java
deleted file mode 100644
index dd090eca5a7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/DurationObservationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DurationObservation creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class DurationObservationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.DURATION_OBSERVATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementHandler.java
deleted file mode 100644
index 2c29fbfefff..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Element creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementImportHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementImportHandler.java
deleted file mode 100644
index c8525f50c24..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ElementImportHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ElementImport creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ElementImportHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ELEMENT_IMPORT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EncapsulatedClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EncapsulatedClassifierHandler.java
deleted file mode 100644
index 9447a1532ff..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EncapsulatedClassifierHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for EncapsulatedClassifier creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class EncapsulatedClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ENCAPSULATED_CLASSIFIER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationHandler.java
deleted file mode 100644
index 6115798ede0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Enumeration creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class EnumerationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ENUMERATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationLiteralHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationLiteralHandler.java
deleted file mode 100644
index c8ec63e356d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EnumerationLiteralHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for EnumerationLiteral creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class EnumerationLiteralHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.ENUMERATION_LITERAL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EventHandler.java
deleted file mode 100644
index d33e9ce173e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/EventHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Event creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class EventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EVENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExceptionHandlerHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExceptionHandlerHandler.java
deleted file mode 100644
index 4faaa3b553f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExceptionHandlerHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExceptionHandler creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExceptionHandlerHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXCEPTION_HANDLER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutableNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutableNodeHandler.java
deleted file mode 100644
index 737e4b42992..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutableNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExecutableNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExecutableNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXECUTABLE_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionEnvironmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionEnvironmentHandler.java
deleted file mode 100644
index 87ea7edf2d3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionEnvironmentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExecutionEnvironment creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExecutionEnvironmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXECUTION_ENVIRONMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionOccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionOccurrenceSpecificationHandler.java
deleted file mode 100644
index b4a6864e879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionOccurrenceSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExecutionOccurrenceSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExecutionOccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXECUTION_OCCURRENCE_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionSpecificationHandler.java
deleted file mode 100644
index ceb126c3d2b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExecutionSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExecutionSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExecutionSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXECUTION_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionNodeHandler.java
deleted file mode 100644
index f5e703d3889..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExpansionNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExpansionNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXPANSION_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionRegionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionRegionHandler.java
deleted file mode 100644
index 16779ceaf3b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpansionRegionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExpansionRegion creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExpansionRegionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXPANSION_REGION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpressionHandler.java
deleted file mode 100644
index 338e6a0829d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExpressionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Expression creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXPRESSION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtendHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtendHandler.java
deleted file mode 100644
index 2ac3c127f06..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtendHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Extend creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExtendHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXTEND;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionEndHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionEndHandler.java
deleted file mode 100644
index 890b8c54a61..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionEndHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExtensionEnd creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExtensionEndHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXTENSION_END;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionHandler.java
deleted file mode 100644
index 2e85ce8b666..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Extension creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExtensionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXTENSION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionPointHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionPointHandler.java
deleted file mode 100644
index ba273cb5cbf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ExtensionPointHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ExtensionPoint creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ExtensionPointHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.EXTENSION_POINT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FeatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FeatureHandler.java
deleted file mode 100644
index 4969651aec3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FeatureHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Feature creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FeatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.FEATURE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalNodeHandler.java
deleted file mode 100644
index c37e4455b4f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FinalNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FinalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.FINAL_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalStateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalStateHandler.java
deleted file mode 100644
index 7bbd45127d9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FinalStateHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FinalState creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FinalStateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.FINAL_STATE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FlowFinalNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FlowFinalNodeHandler.java
deleted file mode 100644
index d003472b797..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FlowFinalNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowFinalNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FlowFinalNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.FLOW_FINAL_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ForkNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ForkNodeHandler.java
deleted file mode 100644
index 2a23878ee43..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ForkNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ForkNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ForkNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.FORK_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FunctionBehaviorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FunctionBehaviorHandler.java
deleted file mode 100644
index 052aab6a1c1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/FunctionBehaviorHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FunctionBehavior creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class FunctionBehaviorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.FUNCTION_BEHAVIOR;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GateHandler.java
deleted file mode 100644
index ec29ac67148..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GateHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Gate creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class GateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.GATE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralOrderingHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralOrderingHandler.java
deleted file mode 100644
index d0990fc086b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralOrderingHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for GeneralOrdering creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class GeneralOrderingHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.GENERAL_ORDERING;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationHandler.java
deleted file mode 100644
index 3b0ff50636c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Generalization creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class GeneralizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.GENERALIZATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationSetHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationSetHandler.java
deleted file mode 100644
index fed19d32fb5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/GeneralizationSetHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for GeneralizationSet creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class GeneralizationSetHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.GENERALIZATION_SET;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ImageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ImageHandler.java
deleted file mode 100644
index db7f42018c2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ImageHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Image creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ImageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.IMAGE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IncludeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IncludeHandler.java
deleted file mode 100644
index 21d4123c92b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IncludeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Include creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class IncludeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INCLUDE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationFlowHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationFlowHandler.java
deleted file mode 100644
index 3b0bad3af5b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationFlowHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InformationFlow creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InformationFlowHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INFORMATION_FLOW;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationItemHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationItemHandler.java
deleted file mode 100644
index 50563988ef0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InformationItemHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InformationItem creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InformationItemHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INFORMATION_ITEM;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InitialNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InitialNodeHandler.java
deleted file mode 100644
index fde0afc9726..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InitialNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InitialNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InitialNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INITIAL_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InputPinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InputPinHandler.java
deleted file mode 100644
index 58e4c541a4b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InputPinHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InputPin creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InputPinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INPUT_PIN;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceSpecificationHandler.java
deleted file mode 100644
index df208a26a40..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InstanceSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InstanceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INSTANCE_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceValueHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceValueHandler.java
deleted file mode 100644
index 2a3745322f3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InstanceValueHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InstanceValue creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InstanceValueHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INSTANCE_VALUE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionConstraintHandler.java
deleted file mode 100644
index 33f16d30d8e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionConstraintHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InteractionConstraint creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InteractionConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERACTION_CONSTRAINT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionFragmentHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionFragmentHandler.java
deleted file mode 100644
index 5e5addb1654..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionFragmentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InteractionFragment creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InteractionFragmentHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERACTION_FRAGMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionHandler.java
deleted file mode 100644
index c952cab95c2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Interaction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InteractionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionOperandHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionOperandHandler.java
deleted file mode 100644
index af20a4d9a12..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionOperandHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InteractionOperand creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InteractionOperandHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERACTION_OPERAND;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionUseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionUseHandler.java
deleted file mode 100644
index 2800ad84dbd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InteractionUseHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InteractionUse creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InteractionUseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERACTION_USE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceHandler.java
deleted file mode 100644
index bddfc9ffeef..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Interface creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InterfaceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERFACE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceRealizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceRealizationHandler.java
deleted file mode 100644
index 7eb8155b134..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterfaceRealizationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InterfaceRealization creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InterfaceRealizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERFACE_REALIZATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterruptibleActivityRegionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterruptibleActivityRegionHandler.java
deleted file mode 100644
index 1f2a14b72ca..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InterruptibleActivityRegionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InterruptibleActivityRegion creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InterruptibleActivityRegionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERRUPTIBLE_ACTIVITY_REGION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalConstraintHandler.java
deleted file mode 100644
index 251f9d3b4f6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalConstraintHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for IntervalConstraint creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class IntervalConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERVAL_CONSTRAINT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalHandler.java
deleted file mode 100644
index 689215b910a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/IntervalHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Interval creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class IntervalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INTERVAL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InvocationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InvocationActionHandler.java
deleted file mode 100644
index 75ca43dc90e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/InvocationActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InvocationAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InvocationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.INVOCATION_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/JoinNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/JoinNodeHandler.java
deleted file mode 100644
index 8baa7b1ff95..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/JoinNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for JoinNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class JoinNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.JOIN_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LifelineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LifelineHandler.java
deleted file mode 100644
index 0bd5e02fbe6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LifelineHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Lifeline creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LifelineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LIFELINE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkActionHandler.java
deleted file mode 100644
index 59aa7f968dd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LinkAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LINK_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndCreationDataHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndCreationDataHandler.java
deleted file mode 100644
index ee4bf701e14..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndCreationDataHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LinkEndCreationData creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LinkEndCreationDataHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LINK_END_CREATION_DATA;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDataHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDataHandler.java
deleted file mode 100644
index 08e9ce3963d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDataHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LinkEndData creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LinkEndDataHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LINK_END_DATA;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDestructionDataHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDestructionDataHandler.java
deleted file mode 100644
index 6c9b28273df..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LinkEndDestructionDataHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LinkEndDestructionData creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LinkEndDestructionDataHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LINK_END_DESTRUCTION_DATA;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralBooleanHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralBooleanHandler.java
deleted file mode 100644
index 2c20b12f876..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralBooleanHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LiteralBoolean creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LiteralBooleanHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LITERAL_BOOLEAN;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralIntegerHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralIntegerHandler.java
deleted file mode 100644
index e621b59cc9a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralIntegerHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LiteralInteger creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LiteralIntegerHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LITERAL_INTEGER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralNullHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralNullHandler.java
deleted file mode 100644
index 66ebe3354c1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralNullHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LiteralNull creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LiteralNullHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LITERAL_NULL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralRealHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralRealHandler.java
deleted file mode 100644
index 60b0cf37e94..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralRealHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LiteralReal creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LiteralRealHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LITERAL_REAL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralSpecificationHandler.java
deleted file mode 100644
index 49c7ae2fc40..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LiteralSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LiteralSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LITERAL_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralStringHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralStringHandler.java
deleted file mode 100644
index f1175ca5505..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralStringHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LiteralString creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LiteralStringHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LITERAL_STRING;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralUnlimitedNaturalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralUnlimitedNaturalHandler.java
deleted file mode 100644
index 6adde8b2422..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LiteralUnlimitedNaturalHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LiteralUnlimitedNatural creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LiteralUnlimitedNaturalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LITERAL_UNLIMITED_NATURAL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LoopNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LoopNodeHandler.java
deleted file mode 100644
index c37f341a7ea..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/LoopNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for LoopNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class LoopNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.LOOP_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ManifestationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ManifestationHandler.java
deleted file mode 100644
index d1cd7348242..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ManifestationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Manifestation creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ManifestationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MANIFESTATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MergeNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MergeNodeHandler.java
deleted file mode 100644
index 25a8ea72dd7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MergeNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for MergeNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class MergeNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MERGE_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEndHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEndHandler.java
deleted file mode 100644
index 5b952e84b61..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEndHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for MessageEnd creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class MessageEndHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MESSAGE_END;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEventHandler.java
deleted file mode 100644
index c670f292b38..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageEventHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for MessageEvent creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class MessageEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MESSAGE_EVENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageHandler.java
deleted file mode 100644
index e258b06d960..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Message creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class MessageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MESSAGE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageOccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageOccurrenceSpecificationHandler.java
deleted file mode 100644
index fb15cad9dd7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MessageOccurrenceSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for MessageOccurrenceSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class MessageOccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MESSAGE_OCCURRENCE_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ModelHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ModelHandler.java
deleted file mode 100644
index 2d8527a6e16..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ModelHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Model creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ModelHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MODEL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MultiplicityElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MultiplicityElementHandler.java
deleted file mode 100644
index 0e0fa939de8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/MultiplicityElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for MultiplicityElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class MultiplicityElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.MULTIPLICITY_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamedElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamedElementHandler.java
deleted file mode 100644
index cee5297a0e0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamedElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for NamedElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class NamedElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.NAMED_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamespaceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamespaceHandler.java
deleted file mode 100644
index 486c8429ee1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NamespaceHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Namespace creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class NamespaceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.NAMESPACE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NodeHandler.java
deleted file mode 100644
index 9f61e5cf2be..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/NodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Node creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class NodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectFlowHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectFlowHandler.java
deleted file mode 100644
index f18c8907a01..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectFlowHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ObjectFlow creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ObjectFlowHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OBJECT_FLOW;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectNodeHandler.java
deleted file mode 100644
index ae76040bcbd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObjectNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ObjectNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ObjectNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OBJECT_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObservationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObservationHandler.java
deleted file mode 100644
index 795f7331a81..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ObservationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Observation creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ObservationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OBSERVATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OccurrenceSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OccurrenceSpecificationHandler.java
deleted file mode 100644
index 4e64f1c4520..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OccurrenceSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for OccurrenceSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OccurrenceSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OCCURRENCE_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueActionHandler.java
deleted file mode 100644
index f83b2705bc5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for OpaqueAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OpaqueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OPAQUE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueBehaviorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueBehaviorHandler.java
deleted file mode 100644
index 405f2317b0d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueBehaviorHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for OpaqueBehavior creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OpaqueBehaviorHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OPAQUE_BEHAVIOR;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueExpressionHandler.java
deleted file mode 100644
index f6992526b3a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OpaqueExpressionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for OpaqueExpression creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OpaqueExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OPAQUE_EXPRESSION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationHandler.java
deleted file mode 100644
index 5a46b616b06..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Operation creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OperationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OPERATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationTemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationTemplateParameterHandler.java
deleted file mode 100644
index be1f6208af3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OperationTemplateParameterHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for OperationTemplateParameter creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OperationTemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OPERATION_TEMPLATE_PARAMETER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OutputPinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OutputPinHandler.java
deleted file mode 100644
index 3963295dfec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/OutputPinHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for OutputPin creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OutputPinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.OUTPUT_PIN;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageHandler.java
deleted file mode 100644
index dae133c75ab..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Package creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PackageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PACKAGE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageImportHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageImportHandler.java
deleted file mode 100644
index 2c3c67562e6..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageImportHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for PackageImport creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PackageImportHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PACKAGE_IMPORT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageMergeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageMergeHandler.java
deleted file mode 100644
index febf1a9af51..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageMergeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for PackageMerge creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PackageMergeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PACKAGE_MERGE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageableElementHandler.java
deleted file mode 100644
index 13a5d0967c5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PackageableElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for PackageableElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PackageableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PACKAGEABLE_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterHandler.java
deleted file mode 100644
index 598be284b8d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Parameter creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PARAMETER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterSetHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterSetHandler.java
deleted file mode 100644
index e1b8f70a45c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterSetHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ParameterSet creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ParameterSetHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PARAMETER_SET;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterableElementHandler.java
deleted file mode 100644
index 6a789ee6df7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ParameterableElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ParameterableElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ParameterableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PARAMETERABLE_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PartDecompositionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PartDecompositionHandler.java
deleted file mode 100644
index b0aa617313e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PartDecompositionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for PartDecomposition creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PartDecompositionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PART_DECOMPOSITION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PinHandler.java
deleted file mode 100644
index 46b0496e5fc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PinHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Pin creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PIN;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PortHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PortHandler.java
deleted file mode 100644
index 124dfe72e1e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PortHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Port creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PortHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PORT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PrimitiveTypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PrimitiveTypeHandler.java
deleted file mode 100644
index 3c2f12ab0dc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PrimitiveTypeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for PrimitiveType creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PrimitiveTypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PRIMITIVE_TYPE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileApplicationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileApplicationHandler.java
deleted file mode 100644
index 5c502b08c58..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileApplicationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ProfileApplication creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ProfileApplicationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROFILE_APPLICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileHandler.java
deleted file mode 100644
index b0da15c8d57..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProfileHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Profile creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ProfileHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROFILE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PropertyHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PropertyHandler.java
deleted file mode 100644
index 8864beddfa5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PropertyHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Property creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PropertyHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROPERTY;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolConformanceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolConformanceHandler.java
deleted file mode 100644
index f9c7ce3453b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolConformanceHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ProtocolConformance creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ProtocolConformanceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROTOCOL_CONFORMANCE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolStateMachineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolStateMachineHandler.java
deleted file mode 100644
index 4a7c4301da0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolStateMachineHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ProtocolStateMachine creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ProtocolStateMachineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROTOCOL_STATE_MACHINE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolTransitionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolTransitionHandler.java
deleted file mode 100644
index f3e718101b7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ProtocolTransitionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ProtocolTransition creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ProtocolTransitionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROTOCOL_TRANSITION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PseudostateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PseudostateHandler.java
deleted file mode 100644
index 8aa2ba95223..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/PseudostateHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Pseudostate creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class PseudostateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PSEUDOSTATE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/QualifierValueHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/QualifierValueHandler.java
deleted file mode 100644
index 7607adba6aa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/QualifierValueHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for QualifierValue creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class QualifierValueHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.QUALIFIER_VALUE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RaiseExceptionActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RaiseExceptionActionHandler.java
deleted file mode 100644
index 2605b3838fb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RaiseExceptionActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for RaiseExceptionAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RaiseExceptionActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.RAISE_EXCEPTION_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadExtentActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadExtentActionHandler.java
deleted file mode 100644
index ff4cace9138..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadExtentActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadExtentAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadExtentActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_EXTENT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadIsClassifiedObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadIsClassifiedObjectActionHandler.java
deleted file mode 100644
index 334d6c72376..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadIsClassifiedObjectActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadIsClassifiedObjectAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadIsClassifiedObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_IS_CLASSIFIED_OBJECT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkActionHandler.java
deleted file mode 100644
index 8472b9c9439..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadLinkAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_LINK_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndActionHandler.java
deleted file mode 100644
index fdcbde449d5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadLinkObjectEndAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadLinkObjectEndActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_LINK_OBJECT_END_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndQualifierActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndQualifierActionHandler.java
deleted file mode 100644
index 729bdaad896..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadLinkObjectEndQualifierActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadLinkObjectEndQualifierAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadLinkObjectEndQualifierActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_LINK_OBJECT_END_QUALIFIER_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadSelfActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadSelfActionHandler.java
deleted file mode 100644
index fe8b2fef16e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadSelfActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadSelfAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadSelfActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_SELF_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadStructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadStructuralFeatureActionHandler.java
deleted file mode 100644
index ea41da9a212..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadStructuralFeatureActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadStructuralFeatureAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadStructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_STRUCTURAL_FEATURE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadVariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadVariableActionHandler.java
deleted file mode 100644
index 3a6a9ab2c09..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReadVariableActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReadVariableAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReadVariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.READ_VARIABLE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RealizationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RealizationHandler.java
deleted file mode 100644
index 91742e47601..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RealizationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Realization creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RealizationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REALIZATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReceptionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReceptionHandler.java
deleted file mode 100644
index d3af82695d5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReceptionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Reception creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReceptionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.RECEPTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReclassifyObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReclassifyObjectActionHandler.java
deleted file mode 100644
index d8ea22e9801..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReclassifyObjectActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReclassifyObjectAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReclassifyObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.RECLASSIFY_OBJECT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableElementHandler.java
deleted file mode 100644
index 7fc724dbb22..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for RedefinableElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RedefinableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REDEFINABLE_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableTemplateSignatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableTemplateSignatureHandler.java
deleted file mode 100644
index 0bf2512f29e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RedefinableTemplateSignatureHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for RedefinableTemplateSignature creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RedefinableTemplateSignatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REDEFINABLE_TEMPLATE_SIGNATURE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReduceActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReduceActionHandler.java
deleted file mode 100644
index 60c06967666..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReduceActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReduceAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReduceActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REDUCE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RefineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RefineHandler.java
deleted file mode 100644
index 90fdda4e640..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RefineHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Refine creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RefineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REFINE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RegionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RegionHandler.java
deleted file mode 100644
index bd63d17ac1a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RegionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Region creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RegionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REGION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RelationshipHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RelationshipHandler.java
deleted file mode 100644
index fe219040908..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RelationshipHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Relationship creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RelationshipHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.RELATIONSHIP;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveStructuralFeatureValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveStructuralFeatureValueActionHandler.java
deleted file mode 100644
index 4bcdeef236d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveStructuralFeatureValueActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for RemoveStructuralFeatureValueAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RemoveStructuralFeatureValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveVariableValueActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveVariableValueActionHandler.java
deleted file mode 100644
index f8700890809..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/RemoveVariableValueActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for RemoveVariableValueAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class RemoveVariableValueActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REMOVE_VARIABLE_VALUE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReplyActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReplyActionHandler.java
deleted file mode 100644
index 4cf4ed13e2d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ReplyActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ReplyAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ReplyActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.REPLY_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendObjectActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendObjectActionHandler.java
deleted file mode 100644
index be69e7959ec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendObjectActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for SendObjectAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SendObjectActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.SEND_OBJECT_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendSignalActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendSignalActionHandler.java
deleted file mode 100644
index f00b9d345a7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SendSignalActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for SendSignalAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SendSignalActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.SEND_SIGNAL_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SequenceNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SequenceNodeHandler.java
deleted file mode 100644
index 0a8f2f96446..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SequenceNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for SequenceNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SequenceNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.SEQUENCE_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalEventHandler.java
deleted file mode 100644
index 72bfe93b5cd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalEventHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for SignalEvent creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SignalEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.SIGNAL_EVENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalHandler.java
deleted file mode 100644
index 6deeba14722..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SignalHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Signal creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SignalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.SIGNAL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SlotHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SlotHandler.java
deleted file mode 100644
index fb550b9c4b1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SlotHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Slot creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SlotHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.SLOT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartClassifierBehaviorActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartClassifierBehaviorActionHandler.java
deleted file mode 100644
index b8174914f3a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartClassifierBehaviorActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StartClassifierBehaviorAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StartClassifierBehaviorActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.START_CLASSIFIER_BEHAVIOR_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartObjectBehaviorActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartObjectBehaviorActionHandler.java
deleted file mode 100644
index 1e815cdc4b0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StartObjectBehaviorActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StartObjectBehaviorAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StartObjectBehaviorActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.START_OBJECT_BEHAVIOR_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateHandler.java
deleted file mode 100644
index cffe35039c1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for State creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StateHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STATE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateInvariantHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateInvariantHandler.java
deleted file mode 100644
index b33e244bdae..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateInvariantHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StateInvariant creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StateInvariantHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STATE_INVARIANT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateMachineHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateMachineHandler.java
deleted file mode 100644
index 72dd5a5821b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StateMachineHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StateMachine creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StateMachineHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STATE_MACHINE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StereotypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StereotypeHandler.java
deleted file mode 100644
index cfc4a476ffd..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StereotypeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Stereotype creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StereotypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STEREOTYPE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StringExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StringExpressionHandler.java
deleted file mode 100644
index a21c45fad92..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StringExpressionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StringExpression creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StringExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STRING_EXPRESSION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureActionHandler.java
deleted file mode 100644
index 649019b45de..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StructuralFeatureAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STRUCTURAL_FEATURE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureHandler.java
deleted file mode 100644
index dec65e49fb4..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuralFeatureHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StructuralFeature creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StructuralFeatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STRUCTURAL_FEATURE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredActivityNodeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredActivityNodeHandler.java
deleted file mode 100644
index 21b440519e8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredActivityNodeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StructuredActivityNode creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StructuredActivityNodeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STRUCTURED_ACTIVITY_NODE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredClassifierHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredClassifierHandler.java
deleted file mode 100644
index 4a8ca31cf2b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/StructuredClassifierHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for StructuredClassifier creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class StructuredClassifierHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.STRUCTURED_CLASSIFIER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SubstitutionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SubstitutionHandler.java
deleted file mode 100644
index 5d8f123e0ec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/SubstitutionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Substitution creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class SubstitutionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.SUBSTITUTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateBindingHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateBindingHandler.java
deleted file mode 100644
index def0a7bd420..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateBindingHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TemplateBinding creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TemplateBindingHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TEMPLATE_BINDING;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterHandler.java
deleted file mode 100644
index 9c0a524f20b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TemplateParameter creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TemplateParameterHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TEMPLATE_PARAMETER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterSubstitutionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterSubstitutionHandler.java
deleted file mode 100644
index 01393621643..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateParameterSubstitutionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TemplateParameterSubstitution creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TemplateParameterSubstitutionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TEMPLATE_PARAMETER_SUBSTITUTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateSignatureHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateSignatureHandler.java
deleted file mode 100644
index ab76e905c1a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateSignatureHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TemplateSignature creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TemplateSignatureHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TEMPLATE_SIGNATURE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateableElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateableElementHandler.java
deleted file mode 100644
index 170057eee1d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TemplateableElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TemplateableElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TemplateableElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TEMPLATEABLE_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TestIdentityActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TestIdentityActionHandler.java
deleted file mode 100644
index f46e95e9c06..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TestIdentityActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TestIdentityAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TestIdentityActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TEST_IDENTITY_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeConstraintHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeConstraintHandler.java
deleted file mode 100644
index 95c260831a2..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeConstraintHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TimeConstraint creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TimeConstraintHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TIME_CONSTRAINT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeEventHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeEventHandler.java
deleted file mode 100644
index 810a9772604..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeEventHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TimeEvent creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TimeEventHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TIME_EVENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeExpressionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeExpressionHandler.java
deleted file mode 100644
index 8aa0f4cb1a1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeExpressionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TimeExpression creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TimeExpressionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TIME_EXPRESSION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeIntervalHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeIntervalHandler.java
deleted file mode 100644
index 70eb06ca40f..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeIntervalHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TimeInterval creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TimeIntervalHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TIME_INTERVAL;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeObservationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeObservationHandler.java
deleted file mode 100644
index 3ae92f07259..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TimeObservationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TimeObservation creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TimeObservationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TIME_OBSERVATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TraceHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TraceHandler.java
deleted file mode 100644
index cd14b48f971..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TraceHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Trace creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TraceHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.AbstractUmlCreateCommandHandler.handler.CreateCommandHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TRACE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TransitionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TransitionHandler.java
deleted file mode 100644
index 835bba6548e..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TransitionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Transition creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TransitionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TRANSITION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TriggerHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TriggerHandler.java
deleted file mode 100644
index 2cd1744d677..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TriggerHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Trigger creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TriggerHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TRIGGER;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypeHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypeHandler.java
deleted file mode 100644
index 9cad1bbfea1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypeHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Type creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TypeHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TYPE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypedElementHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypedElementHandler.java
deleted file mode 100644
index 8c308333bbf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/TypedElementHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for TypedElement creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class TypedElementHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.TYPED_ELEMENT;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UnmarshallActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UnmarshallActionHandler.java
deleted file mode 100644
index 61a3510e0d5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UnmarshallActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for UnmarshallAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class UnmarshallActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.UNMARSHALL_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UsageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UsageHandler.java
deleted file mode 100644
index 5bd3ec94b48..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UsageHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Usage creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class UsageHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.USAGE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UseCaseHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UseCaseHandler.java
deleted file mode 100644
index 2073c7d6c94..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/UseCaseHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for UseCase creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class UseCaseHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.USE_CASE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValuePinHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValuePinHandler.java
deleted file mode 100644
index 8f3c8bf97c1..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValuePinHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValuePin creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ValuePinHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.VALUE_PIN;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationActionHandler.java
deleted file mode 100644
index 5fbe2f57bec..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueSpecificationAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ValueSpecificationActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.VALUE_SPECIFICATION_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationHandler.java
deleted file mode 100644
index ed6146bf53a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/ValueSpecificationHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueSpecification creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class ValueSpecificationHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.VALUE_SPECIFICATION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableActionHandler.java
deleted file mode 100644
index 382c9fec1e8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for VariableAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class VariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.VARIABLE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableHandler.java
deleted file mode 100644
index 6baa16a2c56..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VariableHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Variable creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class VariableHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.VARIABLE;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VertexHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VertexHandler.java
deleted file mode 100644
index 66d46db97ba..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/VertexHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Vertex creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class VertexHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.VERTEX;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteLinkActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteLinkActionHandler.java
deleted file mode 100644
index dbef12af9a8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteLinkActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for WriteLinkAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class WriteLinkActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.WRITE_LINK_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteStructuralFeatureActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteStructuralFeatureActionHandler.java
deleted file mode 100644
index a39f56fefab..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteStructuralFeatureActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for WriteStructuralFeatureAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class WriteStructuralFeatureActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.WRITE_STRUCTURAL_FEATURE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteVariableActionHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteVariableActionHandler.java
deleted file mode 100644
index 0ca0c7f9cd9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src-gen/org/eclipse/papyrus/uml/nattable/menu/handlers/WriteVariableActionHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.nattable.menu.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * Command handler for WriteVariableAction creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class WriteVariableActionHandler extends AbstractUmlNattableCreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.WRITE_VARIABLE_ACTION;
-	}
-}
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/Activator.java
deleted file mode 100644
index 1b719532f08..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/Activator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.menu;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.IStartup;

-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 implements IStartup {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.nattable.menu"; //$NON-NLS-1$

-

-

-	/** The log service */

-	public static LogHelper log;

-

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * 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(plugin);

-	}

-

-	/*

-	 * (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;

-	}

-

-	public void earlyStartup() {

-		// TODO Auto-generated method stub

-

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractUmlNattableCreateCommandHandler.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractUmlNattableCreateCommandHandler.java
deleted file mode 100644
index b0bf9449695..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/AbstractUmlNattableCreateCommandHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.menu.handlers;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.nattable.menu.util.TableMenuUtils;

-import org.eclipse.papyrus.uml.service.types.handlers.AbstractUmlCreateCommandHandler;

-import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;

-

-/**

- * Abstract handler for the creation commands of UML elements in the Nattable editor

- * 

- */

-public abstract class AbstractUmlNattableCreateCommandHandler extends AbstractUmlCreateCommandHandler {

-

-

-	/**

-	 * <pre>

-	 * 

-	 * Build the create command for an element creation in the selected container.

-	 * The create command is given by the {@link IElementEditService} of selected 

-	 * element.

-	 * 

-	 * @return the composite creation command for current selection

-	 * 

-	 * </pre>

-	 */

-	protected Command buildCommand() {

-		Command createCmd = super.buildCommand();

-		return TableMenuUtils.buildNattableCreationCommand(createCmd, this.createRequest);

-

-	}

-

-	/**

-	 * Obtain the context of the active table editor.

-	 * 

-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractUmlCreateCommandHandler#getCommandContext()

-	 * 

-	 * @return

-	 */

-	protected ICommandContext getCommandContext() {

-		return TableMenuUtils.getTableCommandContext(TableMenuUtils.getTableManager(getActiveWorkbenchPart()));

-

-	}

-

-	/**

-	 * Verify if this handler is currently active and the command can execute. Additionally, verify if this table can add this type of element.

-	 * 

-	 * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	public void setEnabled(Object evaluationContext) {

-		INattableModelManager tableManager = TableMenuUtils.getTableManager(getActiveWorkbenchPart());

-		boolean isEnabled = tableManager.canCreateRowElement(getElementTypeToCreate().getId());

-		if(isEnabled) {

-			//we test the enable of the super implementation

-			super.setEnabled(evaluationContext);

-			isEnabled = super.isEnabled();

-		}

-		setBaseEnabled(isEnabled);

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/UmlNattableCreateMenu.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/UmlNattableCreateMenu.java
deleted file mode 100644
index 58b3762b7c0..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/handlers/UmlNattableCreateMenu.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.menu.handlers;

-

-import org.eclipse.papyrus.infra.nattable.utils.NattableWidgetPropertyTester;

-import org.eclipse.papyrus.uml.service.types.menu.AbstractCreateUmlChildMenu;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.menus.IContributionRoot;

-import org.eclipse.ui.services.IServiceLocator;

-

-/**

- * Menu contributions for the creation of UML elements from the Nattable editor

- */

-public class UmlNattableCreateMenu extends AbstractCreateUmlChildMenu {

-

-	private NattableWidgetPropertyTester tester = new NattableWidgetPropertyTester();

-

-	@Override

-	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {

-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

-		if(tester.test(part, NattableWidgetPropertyTester.IS_NATTABLE_WIDGET, null, Boolean.TRUE)) {

-			super.createContributionItems(serviceLocator, additions);

-		}

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/messages/Messages.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/messages/Messages.java
deleted file mode 100644
index 790a7f7be9a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/messages/Messages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.menu.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.nattable.menu.messages.messages"; //$NON-NLS-1$

-

-	public static String AbstractNattableCreateCommandHandler_AddElementCommand;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/messages/messages.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/messages/messages.properties
deleted file mode 100644
index aa84a372d23..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/messages/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-AbstractNattableCreateCommandHandler_AddElementCommand=Add element to the table

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/util/TableMenuUtils.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/util/TableMenuUtils.java
deleted file mode 100644
index 1c081c3d832..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.menu/src/org/eclipse/papyrus/uml/nattable/menu/util/TableMenuUtils.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.menu.util;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.uml.nattable.menu.messages.Messages;

-import org.eclipse.papyrus.uml.service.types.utils.CommandContext;

-import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * Utilities for the creation of contextual menus from the Nattable editor

- */

-public class TableMenuUtils {

-

-	/**

-	 * FIXME move me in an upper plugin

-	 * 

-	 * @param tableManager

-	 *        the table manager

-	 * @return

-	 *         the command context to use to create new elements in the table

-	 */

-	public static ICommandContext getTableCommandContext(INattableModelManager tableManager) {

-		INattableModelManager manager = tableManager;

-		if(manager != null) {

-			final EObject container = manager.getTable().getContext();

-			ICommandContext context = null;

-			if(container != null) {

-				context = new CommandContext(container);

-			}

-			return context;

-		}

-		return null;

-	}

-

-	/**

-	 * FIXME move me in an upper plugin

-	 * 

-	 * @param activeWorkbenchPart

-	 * @return

-	 *         the table manager from the workbench part

-	 */

-	public static INattableModelManager getTableManager(IWorkbenchPart activeWorkbenchPart) {

-		IWorkbenchPart activePart = activeWorkbenchPart;

-		if(activePart instanceof AbstractMultiPageSashEditor) {

-			activePart = ((AbstractMultiPageSashEditor)activePart).getActiveEditor();

-			if(activePart != null) {

-				return (INattableModelManager)activePart.getAdapter(INattableModelManager.class);

-			}

-

-		}

-		return null;

-	}

-

-	public static Command buildNattableCreationCommand(Command createCmd, final CreateElementRequest createElementRequest) {

-		final INattableModelManager nattableModelManager = getTableManager(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart());

-		if(nattableModelManager != null) {

-			CompositeCommand cmd = new CompositeCommand(""); //$NON-NLS-1$

-			cmd.add(new EMFtoGMFCommandWrapper(createCmd));

-

-			//		depends on the synchronization of the axis manager

-			cmd.add(new AbstractTransactionalCommand(createElementRequest.getEditingDomain(), Messages.AbstractNattableCreateCommandHandler_AddElementCommand, null) {

-

-				@Override

-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-					EObject newElement = createElementRequest.getNewElement();

-					Collection<Object> toAdd = new ArrayList<Object>();

-					toAdd.add(newElement);

-					Command tmp = nattableModelManager.getAddRowElementCommand(toAdd);

-					if(tmp != null) {

-						tmp.execute();

-					}

-					return CommandResult.newOKCommandResult();

-				}

-			});

-			return new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(cmd);

-

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.classpath b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.classpath
deleted file mode 100644
index 8d1cb82ffcf..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry excluding="org/eclipse/papyrus/uml/nattable/celleditor/editor/SingleReferenceComboCellEditor.java" kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.project b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.project
deleted file mode 100644
index 87987e77a69..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.settings/org.eclipse.jdt.core.prefs b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
deleted file mode 100644
index 44fe732dc46..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.tools;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.infra.gmfdiag.commands,
- org.eclipse.gmf.runtime.emf.type.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.uml.nattable,
- org.eclipse.papyrus.uml.nattable.config,
- org.eclipse.papyrus.uml.nattable.dataprovider,
- org.eclipse.papyrus.uml.nattable.editor,
- org.eclipse.papyrus.uml.nattable.manager.axis,
- org.eclipse.papyrus.uml.nattable.manager.cell,
- org.eclipse.papyrus.uml.nattable.messages,
- org.eclipse.papyrus.uml.nattable.provider,
- org.eclipse.papyrus.uml.nattable.tester,
- org.eclipse.papyrus.uml.nattable.utils,
- org.eclipse.papyrus.uml.nattable.validator,
- org.eclipse.papyrus.uml.nattable.widget
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/OSGI-INF/l10n/bundle.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index fb1195dca7a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.uml.nattable

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = UML Nattable (Incubation)
\ No newline at end of file
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/about.html b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>May 12, 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/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/build.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/build.properties
deleted file mode 100644
index 9ba7958efa7..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               plugin.pdoc,\

-               plugin.xml,\

-               icons/

-src.includes = about.html

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/icons/aggreg_shared.gif b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/icons/aggreg_shared.gif
deleted file mode 100644
index efaa877cccc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/icons/aggreg_shared.gif
+++ /dev/null
diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/plugin.pdoc b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/plugin.pdoc
deleted file mode 100644
index b4e5c067f2c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the celleditors for the ULM Element">

-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>

-</doc:Documentation>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/plugin.xml
deleted file mode 100644
index 5af576f0a19..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/plugin.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.celleditor.configuration">

-      <configuration

-            class="org.eclipse.papyrus.uml.nattable.config.UMLFeatureCellEditorConfig"

-            order="500">

-      </configuration>

-   </extension>

- <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="1300"

-            provider="org.eclipse.papyrus.uml.nattable.provider.StereotypePropertyHeaderLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">

-         </labelProviderContext>

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-      <labelProvider

-            priority="1800"

-            provider="org.eclipse.papyrus.uml.nattable.provider.UMLUnlimitedNaturalLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.body.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-      <labelProvider

-            priority="1900"

-            provider="org.eclipse.papyrus.uml.nattable.provider.StereotypePropertyCellLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.body.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.axismanager">

-      <axisManager

-            id="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager"

-            manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLStereotypePropertyAxisManager">

-      </axisManager>

-      <axisManager

-            id="org.eclipse.papyrus.uml.nattable.element.axis.manager"

-            manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLElementAxisManager">

-      </axisManager>

-      <axisManager

-            id="org.eclipse.papyrus.uml.nattable.feature.axis.manager"

-            manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLFeatureAxisManager">

-      </axisManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.cellmanager">

-      <cellManager

-            id="org.eclipse.papyrus.uml.nattable.uml.feature.cell.manager"

-            manager="org.eclipse.papyrus.uml.nattable.manager.cell.UMLFeatureCellManager"

-            order="500">

-      </cellManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.tester">

-      <tester

-            class="org.eclipse.papyrus.uml.nattable.tester.IsUMLElementTester"

-            id="org.eclipse.papyrus.uml.nattable.tester.isumlelement">

-      </tester>

-   </extension>
-</plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java
deleted file mode 100644
index 9f70ea359ae..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************

- * 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.uml.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.uml.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(plugin);

-	}

-

-	/*

-	 * (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/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
deleted file mode 100644
index 924eff11530..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
+++ /dev/null
@@ -1,498 +0,0 @@
-package org.eclipse.papyrus.uml.nattable.config;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.DefaultDisplayConverter;

-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.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.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

-import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.celleditor.ButtonConfiguration;

-import org.eclipse.papyrus.infra.nattable.celleditor.ComboBoxWithButtonCellEditor;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.uml.nattable.dataprovider.UMLSingleReferenceComboBoxDataProvider;

-import org.eclipse.papyrus.uml.nattable.dataprovider.UMLStereotypeSingleEnumerationComboBoxDataProvider;

-import org.eclipse.papyrus.uml.nattable.editor.MultiBooleanCellEditor;

-import org.eclipse.papyrus.uml.nattable.editor.MultiEnumCellEditor;

-import org.eclipse.papyrus.uml.nattable.editor.MultiIntegerCellEditor;

-import org.eclipse.papyrus.uml.nattable.editor.MultiRealCellEditor;

-import org.eclipse.papyrus.uml.nattable.editor.MultiReferenceCellEditor;

-import org.eclipse.papyrus.uml.nattable.editor.MultiStringCellEditor;

-import org.eclipse.papyrus.uml.nattable.editor.MultiUnlimitedNaturalCellEditor;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.papyrus.uml.nattable.validator.RealDataValidator;

-import org.eclipse.papyrus.uml.nattable.validator.UnlimitedNaturalDataValidator;

-import org.eclipse.papyrus.uml.nattable.widget.UMLDialogComboAction;

-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLPackage;

-

-

-public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {

-

-	/**

-	 * the id for this editor configuration

-	 */

-	public static final String EDITOR_CONFIG_ID = "UML_EDITOR_CONFIG";

-

-

-	/**

-	 * Definition of the id for the UML type

-	 */

-	public static final int SINGLE_REAL = 100;

-

-	public static final int MULTI_REAL = SINGLE_REAL + 1;

-

-	public static final int SINGLE_UNLIMITED_NATURAL = MULTI_REAL + 1;

-

-	public static final int MULTI_UNLIMITED_NATURAL = SINGLE_UNLIMITED_NATURAL + 1;

-

-	public static final int SINGLE_UML_ENUMERATION = MULTI_UNLIMITED_NATURAL + 1;

-

-	public static final int MULTI_UML_ENUMERATION = SINGLE_UML_ENUMERATION + 1;

-

-	public static final int SINGLE_UML_REFERENCE = MULTI_UML_ENUMERATION + 1;

-

-	public static final int MULTI_UML_REFERENCE = SINGLE_UML_REFERENCE + 1;

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.AbstractEMFSingleFeatureSingleEditorConfig#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table,

-	 *      java.lang.Object)

-	 * 

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 *         <code>true</code> id the object is a UML feature or a representation of a property of stereotype

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		boolean result = false;

-		final String id = AxisUtils.getPropertyId(axisElement);

-		if(id != null) {

-			result = id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX);

-		}

-		if(!result) {

-			result = super.handles(table, axisElement);

-			if(result) {

-				final EStructuralFeature feature = (EStructuralFeature)axisElement;

-				final EObject featureContainer = feature.eContainer();

-				result = UMLPackage.eINSTANCE.eContents().contains(featureContainer);

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#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, Object axisElement, ITableAxisElementProvider elementProvider) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		ICellEditor editor = null;

-		switch(editorKind) {

-		case SINGLE_REAL:

-		case SINGLE_UNLIMITED_NATURAL:

-			editor = new TextCellEditor();

-			break;

-		case SINGLE_UML_REFERENCE:

-			UMLSingleReferenceComboBoxDataProvider dataProvider = new UMLSingleReferenceComboBoxDataProvider(axisElement, elementProvider);

-			UMLDialogComboAction action = new UMLDialogComboAction(axisElement, dataProvider);//FIXME : try to replace the comboAction by a AbstractCellFileEditor...

-			ButtonConfiguration conf = new ButtonConfiguration();

-			//		conf.setImage(Activator.getDefault().getImage("/icons/browse_12x12.gif"));

-			conf.setText("...");

-			conf.setAction(action);

-			conf.setTooltipText("Open a dialog to select the value");

-			editor = new ComboBoxWithButtonCellEditor(dataProvider, conf);

-			break;

-		case SINGLE_UML_ENUMERATION:

-			editor = new ComboBoxCellEditor(getComboDataProvider(table, axisElement, elementProvider));

-			break;

-		case MULTI_BOOLEAN:

-			editor = new MultiBooleanCellEditor(axisElement, elementProvider);

-			break;

-		case MULTI_UNLIMITED_NATURAL:

-			editor = new MultiUnlimitedNaturalCellEditor(axisElement, elementProvider);

-			break;

-		case MULTI_INTEGER:

-			editor = new MultiIntegerCellEditor(axisElement, elementProvider);

-			break;

-		case MULTI_REAL:

-			editor = new MultiRealCellEditor(axisElement, elementProvider);

-			break;

-		case MULTI_STRING:

-			editor = new MultiStringCellEditor(axisElement, elementProvider);

-			break;

-		case MULTI_UML_REFERENCE:

-			editor = new MultiReferenceCellEditor(axisElement, elementProvider);

-			break;

-		case MULTI_EENUM_TYPE:

-			editor = new MultiEnumCellEditor(axisElement, elementProvider);

-			break;

-		case MULTI_UML_ENUMERATION:

-			editor = new MultiEnumCellEditor(axisElement, elementProvider);

-			break;

-		default:

-			editor = super.getICellEditor(table, axisElement, elementProvider);

-			break;

-		}

-		return editor;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#getComboDataProvider(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

-	 *         the combo data provider to use for the combo

-	 */

-	@Override

-	protected IComboBoxDataProvider getComboDataProvider(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		IComboBoxDataProvider comboDataProvider = null;

-		final String id;

-		if(axisElement instanceof IdAxis) {

-			id = ((IdAxis)axisElement).getElement();

-		} else if(axisElement instanceof String) {

-			id = (String)axisElement;

-		} else {

-			id = null;

-		}

-		if(id != null) {//it is a stereotype property

-			comboDataProvider = new UMLStereotypeSingleEnumerationComboBoxDataProvider(axisElement, elementProvider);

-		}

-		if(comboDataProvider == null) {

-			comboDataProvider = super.getComboDataProvider(table, axisElement, elementProvider);

-		}

-		return comboDataProvider;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.AbstractEMFSingleFeatureSingleEditorConfig#getFeatureIdentifier(org.eclipse.papyrus.infra.nattable.model.nattable.Table,

-	 *      java.lang.Object)

-	 * 

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 *         the an id to identify the type of the element

-	 */

-	@Override

-	protected int getFeatureIdentifier(Table table, Object axisElement) {

-		int editorKind = UNKNOWN_TYPE;

-		if(axisElement instanceof IAxis) {

-			editorKind = getIAxisFeatureIdentifier(table, (IAxis)axisElement);

-		} else if(axisElement instanceof String) {

-			String id = (String)axisElement;

-			if(id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {

-				editorKind = getStereotypeAxisFeatureIdentifier(table, id);

-			}

-		} else if(axisElement instanceof EStructuralFeature) {

-			final EStructuralFeature feature = (EStructuralFeature)axisElement;

-			final EClassifier etype = feature.getEType();

-			final boolean isMany = feature.isMany();

-			if(etype == TypesPackage.eINSTANCE.getString()) {

-				if(isMany) {

-					editorKind = MULTI_STRING;

-				} else {

-					editorKind = SINGLE_STRING;

-				}

-			} else if(etype == TypesPackage.eINSTANCE.getBoolean()) {

-				if(isMany) {

-					editorKind = MULTI_BOOLEAN;

-				} else {

-					editorKind = SINGLE_BOOLEAN;

-				}

-			} else if(etype == TypesPackage.eINSTANCE.getReal()) {

-				if(isMany) {

-					editorKind = MULTI_REAL;

-				} else {

-					editorKind = SINGLE_REAL;

-				}

-			} else if(etype == TypesPackage.eINSTANCE.getUnlimitedNatural()) {

-				if(isMany) {

-					editorKind = MULTI_UNLIMITED_NATURAL;

-				} else {

-					editorKind = SINGLE_UNLIMITED_NATURAL;

-				}

-			} else if(etype == TypesPackage.eINSTANCE.getInteger()) {

-				if(isMany) {

-					editorKind = MULTI_INTEGER;

-				} else {

-					editorKind = SINGLE_INTEGER;

-				}

-			} else if(EMFHelper.isSuperType(UMLPackage.eINSTANCE.getElement(), etype)) {

-				if(isMany) {

-					editorKind = MULTI_UML_REFERENCE;

-				} else {

-					editorKind = SINGLE_UML_REFERENCE;

-				}

-			}

-			if(editorKind == UNKNOWN_TYPE) {

-				editorKind = super.getFeatureIdentifier(table, axisElement);

-			}

-		}

-		return editorKind;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param axis

-	 *        the axis

-	 * @return

-	 *         the id for the type of stereotype property represented by the axis

-	 */

-	protected int getIAxisFeatureIdentifier(final Table table, final IAxis axis) {

-		int editorKind = -1;

-		if(axis instanceof IdAxis) {

-			String id = ((IdAxis)axis).getElement();

-			if(id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {

-				editorKind = getStereotypeAxisFeatureIdentifier(table, id);

-			}

-		}

-		return editorKind;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param id

-	 *        the id of the edited property of stereotype

-	 * @return

-	 */

-	protected int getStereotypeAxisFeatureIdentifier(final Table table, final String id) {

-		int editorKind = -1;

-		if(id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {

-			final Property prop = UMLTableUtils.getRealStereotypeProperty(table.getContext(), id);

-			if(prop != null && prop.getType() != null) {

-				boolean isMany = prop.isMultivalued();

-				final Type type = prop.getType();

-				if(type instanceof DataType) {

-					if(type instanceof PrimitiveType) {

-						final String name = type.getName();

-						if(PrimitivesTypesUtils.UML_BOOLEAN.equals(name)) {

-							if(isMany) {

-								editorKind = MULTI_BOOLEAN;

-							} else {

-								editorKind = SINGLE_BOOLEAN;

-							}

-						} else if(PrimitivesTypesUtils.UML_INTEGER.equals(name)) {

-							if(isMany) {

-								editorKind = MULTI_INTEGER;

-							} else {

-								editorKind = SINGLE_INTEGER;

-							}

-						} else if(PrimitivesTypesUtils.UML_REAL.equals(name)) {

-							if(isMany) {

-								editorKind = MULTI_REAL;

-							} else {

-								editorKind = SINGLE_REAL;

-							}

-						} else if(PrimitivesTypesUtils.UML_STRING.equals(name)) {

-							if(isMany) {

-								editorKind = MULTI_STRING;

-							} else {

-								editorKind = SINGLE_STRING;

-							}

-						} else if(PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name)) {

-							if(isMany) {

-								editorKind = MULTI_UNLIMITED_NATURAL;

-							} else {

-								editorKind = SINGLE_UNLIMITED_NATURAL;

-							}

-						} else {

-							//custom primitive type are managed as string

-							if(isMany) {

-								editorKind = MULTI_STRING;

-							} else {

-								editorKind = SINGLE_STRING;

-							}

-						}

-					} else if(type instanceof Enumeration) {

-						if(isMany) {

-							editorKind = MULTI_UML_ENUMERATION;

-						} else {

-							editorKind = SINGLE_UML_ENUMERATION;

-						}

-					} else {//datatype are managed as string

-						//currently the datatype are not managed because we are working on it!

-						//						if(isMany) {

-						//							editorKind = MULTI_STRING;

-						//						} else {

-						//							editorKind = SINGLE_STRING;

-						//						}

-					}

-				} else if(type instanceof Element) {

-					if(isMany) {

-						editorKind = MULTI_UML_REFERENCE;

-					} else {

-						editorKind = SINGLE_UML_REFERENCE;

-					}

-				}

-			}

-		}

-		return editorKind;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#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 painter = null;

-		switch(editorKind) {

-		case SINGLE_REAL:

-		case SINGLE_UNLIMITED_NATURAL:

-			painter = new TextPainter();

-			break;

-		default:

-			painter = super.getCellPainter(table, axisElement);

-			break;

-		}

-		return painter;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#getDisplayConvert(java.lang.Object,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.Table, org.eclipse.jface.viewers.ILabelProvider)

-	 * 

-	 * @param axisElement

-	 * @param table

-	 * @param provider

-	 * @return

-	 */

-	@Override

-	public IDisplayConverter getDisplayConvert(Object axisElement, Table table, final ILabelProvider provider) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		IDisplayConverter converter = null;

-		switch(editorKind) {

-		case SINGLE_UML_REFERENCE:

-			converter = new DisplayConverter() {

-

-				@Override

-				public Object displayToCanonicalValue(Object displayValue) {

-					return null;

-				}

-

-				@Override

-				public Object canonicalToDisplayValue(Object canonicalValue) {//FIXME : we should use the table label provider to do the conversion!

-					if(canonicalValue instanceof DynamicEObjectImpl) {

-						EStructuralFeature feature = ((DynamicEObjectImpl)canonicalValue).eClass().getEStructuralFeature("base_Class");

-						return provider.getText(((DynamicEObjectImpl)canonicalValue).eGet(feature));

-					}

-					return provider.getText(canonicalValue);

-				}

-			};

-			break;

-		case MULTI_UML_REFERENCE:

-			converter = new DefaultDisplayConverter() {

-

-				@Override

-				public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {

-					return displayValue;

-				}

-			};

-			break;

-		case SINGLE_UNLIMITED_NATURAL:

-			converter = new DefaultDisplayConverter() {

-

-				@Override

-				public Object canonicalToDisplayValue(Object sourceValue) {//FIXME : we should use the table label provider to do the conversion!

-					if(sourceValue.equals(new Integer(-1))) {

-						return "*";

-					}

-					return sourceValue;

-				}

-

-				@Override

-				public Object displayToCanonicalValue(Object destinationValue) {

-					if(destinationValue.equals("*")) {

-						return new Integer(-1);

-					}

-					return new Integer((String)destinationValue);

-				}

-			};

-			break;

-		default:

-			converter = super.getDisplayConvert(axisElement, table, provider);

-			break;

-		}

-		return converter;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#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) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		IDataValidator converter = null;

-		switch(editorKind) {

-		case SINGLE_REAL:

-			converter = new RealDataValidator();

-			break;

-		case SINGLE_UNLIMITED_NATURAL:

-			converter = new UnlimitedNaturalDataValidator();

-			break;

-		default:

-			converter = super.getDataValidator(table, axisElement);

-			break;

-		}

-		return converter;

-	}

-

-	@Override

-	public String getEditorId() {

-		return EDITOR_CONFIG_ID;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLSingleReferenceComboBoxDataProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLSingleReferenceComboBoxDataProvider.java
deleted file mode 100644
index 6e3ce9333cb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLSingleReferenceComboBoxDataProvider.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.dataprovider;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.widgets.providers.HierarchicToFlatContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.TreeToFlatContentProvider;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.papyrus.uml.tools.providers.UMLContentProvider;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * 

- * @author Vincent Lorenzo

- *         This class provides the contents to display for single reference in the combobox

- */

-public class UMLSingleReferenceComboBoxDataProvider implements IComboBoxDataProvider {

-

-	/**

-	 * The table axis element provider

-	 */

-	private ITableAxisElementProvider elementProvider;

-

-	/**

-	 * the axis element on which the combobox is declared

-	 */

-	private Object axisElement;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 *        the axis element on which the combobox is declared

-	 * @param elementProvider

-	 *        The table axis element provider

-	 */

-	public UMLSingleReferenceComboBoxDataProvider(final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		this.elementProvider = elementProvider;

-		this.axisElement = axisElement;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)

-	 * 

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	public List<?> getValues(int columnIndex, int rowIndex) {

-		final Object colElement = this.elementProvider.getColumnElement(columnIndex);

-		final Object rowElement = this.elementProvider.getRowElement(rowIndex);

-

-		Element editedElement = null;

-		Object axis = null;

-		if(colElement == this.axisElement && rowElement instanceof EObject) {

-			editedElement = (Element)rowElement;

-			axis = colElement;

-		} else if(colElement instanceof EObject && rowElement == this.axisElement) {

-			editedElement = (Element)colElement;

-			axis = rowElement;

-		}

-

-		if(editedElement != null && axis != null) {

-			if(axis instanceof EReference) {

-				return getPossibleValues(editedElement, (EReference)axis);

-			} else {

-				final String id = AxisUtils.getPropertyId(this.axisElement);

-				return getPossibleValuesForStereotypeProperty(editedElement, id);

-			}

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * FIXME : should be merge with the specific method for stereotype property

-	 * FIXME : this method should be stored in another plugin specific for UML

-	 * 

-	 * @param element

-	 *        the edited element

-	 * @param feature

-	 *        the edited feature

-	 * @return

-	 *         the list of the possible values for this element

-	 */

-	private List<EObject> getPossibleValues(final EObject element, final EReference feature) {

-		final List<EObject> availableValues = new ArrayList<EObject>();

-		UMLContentProvider provider = new UMLContentProvider(element, feature, null, element.eResource().getResourceSet());

-		final TreeToFlatContentProvider flatP = new HierarchicToFlatContentProvider(provider);

-		final List<Object> list = Arrays.asList(flatP.getElements());

-		final Iterator<Object> iter = list.iterator();

-		while(iter.hasNext()) {

-			final Object current = iter.next();

-			if(current instanceof EObject) {

-				availableValues.add((EObject)current);

-			}

-		}

-		return availableValues;

-	}

-

-	/**

-	 * 

-	 * @param element

-	 *        the element which are editing

-	 * @param id

-	 *        the id of the stereotype property

-	 * @return

-	 *         the list of the possible values for this element

-	 */

-	private List<EObject> getPossibleValuesForStereotypeProperty(final Element element, final String id) {

-		final List<EObject> availableValues = new ArrayList<EObject>();

-		Property prop = UMLTableUtils.getRealStereotypeProperty(element, id);

-		final List<Stereotype> stereotypes = UMLTableUtils.getAppliedSteretoypesWithThisProperty(element, id);

-		EObject steAppl = element.getStereotypeApplication(stereotypes.get(0));

-		EStructuralFeature stereotypePropertyFeature = steAppl.eClass().getEStructuralFeature(prop.getName());

-		final Stereotype ste = stereotypes.get(0);

-		EObject container = prop.eContainer();

-		assert container instanceof Stereotype;

-		UMLContentProvider provider = new UMLContentProvider(steAppl, stereotypePropertyFeature, ste, element.eResource().getResourceSet());

-		final TreeToFlatContentProvider flatP = new HierarchicToFlatContentProvider(provider);

-		final List<Object> list = Arrays.asList(flatP.getElements());

-		final Iterator<Object> iter = list.iterator();

-		while(iter.hasNext()) {

-			final Object current = iter.next();

-			if(current instanceof EObject) {

-				availableValues.add((EObject)current);

-			}

-		}

-

-		return availableValues;

-	}

-

-

-	/**

-	 * 

-	 * @param columnIndex

-	 *        the column index

-	 * @param rowIndex

-	 *        the rowindex

-	 * @return

-	 *         the edited object located at this place

-	 */

-	//	FIXME : try to remove this method, improving the ComboAction...

-	public EObject getEditedEObject(int columnIndex, int rowIndex) {

-		final Object colElement = this.elementProvider.getColumnElement(columnIndex);

-		final Object rowElement = this.elementProvider.getRowElement(rowIndex);

-

-		Element el = (Element)rowElement;

-

-		if(colElement == this.axisElement) {

-			el = (Element)rowElement;

-		} else if(rowElement == this.axisElement) {

-			el = (Element)colElement;

-		} else {

-			//There is a problem in the declaration of the editor...

-		}

-		return el;

-	}

-

-	/**

-	 * 

-	 * @param columnIndex

-	 *        the column index

-	 * @param rowIndex

-	 *        the row index

-	 * @return

-	 *         the edited feature located at this place

-	 */

-	//FIXME : try to remove this method, improving the ComboAction...

-	public Object getEditedFeature(int columnIndex, int rowIndex) {

-		return this.axisElement;

-	}

-

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java
deleted file mode 100644
index a6e32e76e04..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.dataprovider;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * 

- * @author Vincent Lorenzo

- *         This class provides the possibles enumeration literal for properties of stereotype typed with a UMLEnumerationLiteral

- */

-public class UMLStereotypeSingleEnumerationComboBoxDataProvider implements IComboBoxDataProvider {

-

-	/**

-	 * The table axis element provider

-	 */

-	private ITableAxisElementProvider elementProvider;

-

-	/**

-	 * the obejct represented by the axis

-	 */

-	private Object axisElement;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 *        the obejct represented by the axis

-	 * @param elementProvider

-	 *        The table axis element provider

-	 */

-	public UMLStereotypeSingleEnumerationComboBoxDataProvider(final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		this.axisElement = axisElement;

-		this.elementProvider = elementProvider;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)

-	 * 

-	 * @param columnIndex

-	 * @param rowIndex

-	 * 

-	 * @return

-	 *         the list of the available enumeration literal

-	 */

-	public List<?> getValues(int columnIndex, int rowIndex) {

-		final List<Object> literals = new ArrayList<Object>();

-		Object el = this.elementProvider.getColumnElement(columnIndex);

-		Object rowElement = this.elementProvider.getRowElement(rowIndex);

-		Element modelElement = null;

-		if(rowElement instanceof Element && el == this.axisElement) {

-			modelElement = (Element)rowElement;

-		} else if(rowElement == this.axisElement && el instanceof Element) {

-			modelElement = (Element)el;

-		}

-		if(modelElement != null) {

-			final String id = AxisUtils.getPropertyId(this.axisElement);

-			final Property property = UMLTableUtils.getRealStereotypeProperty(modelElement, id);

-			final List<Stereotype> ste = UMLTableUtils.getAppliedSteretoypesWithThisProperty(modelElement, id);

-			if(ste.size() == 1) {

-				final Stereotype current = ste.get(0);

-				final EObject steAppl = modelElement.getStereotypeApplication(current);

-				final EStructuralFeature feature = steAppl.eClass().getEStructuralFeature(property.getName());

-				final EEnum eenum = (EEnum)feature.getEType();

-				for(final EEnumLiteral instances : eenum.getELiterals()) {

-					literals.add(instances.getInstance());

-				}

-			}

-		}

-		return literals;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/AbstractUMLMultiValueCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/AbstractUMLMultiValueCellEditor.java
deleted file mode 100644
index a71b8591389..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/AbstractUMLMultiValueCellEditor.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.papyrus.uml.tools.providers.UMLContentProvider;

-import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * 

- * Abstract Cell Editor for MultiValued properties

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractUMLMultiValueCellEditor extends AbstractDialogCellEditor {

-

-	private Collection<Object> returnedValue;

-

-	/**

-	 * the table axis element provider

-	 */

-	protected ITableAxisElementProvider manager;

-

-	/**

-	 * the axis element

-	 */

-	private Object axisElement;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 *        the axis element

-	 * @param elementProvider

-	 *        the table axis element provider

-	 */

-	protected AbstractUMLMultiValueCellEditor(final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		this.manager = elementProvider;

-		this.axisElement = axisElement;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor#open()

-	 * 

-	 * @return

-	 */

-	@Override

-	public int open() {

-		return ((MultipleValueSelectorDialog)this.dialog).open();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor#createDialogInstance()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Object createDialogInstance() {

-		int columnIndex = this.layerCell.getColumnIndex();

-		int rowIndex = this.layerCell.getRowIndex();

-		final Object row = this.manager.getRowElement(rowIndex);

-		final Object column = this.manager.getColumnElement(columnIndex);

-		Element editedElement = null;

-		Object feature = null;

-		if(row instanceof EObject && column == this.axisElement) {

-			editedElement = (Element)row;

-			feature = column;

-		} else {

-			editedElement = (Element)column;

-			feature = row;

-		}

-

-		EStructuralFeature realFeature = null;

-		EObject realEditedObject = null;

-		Stereotype stereotype = null;

-		List<Stereotype> stereotypesWithEditedFeatureAppliedOnElement = null;

-		if(feature instanceof EStructuralFeature) {

-			realFeature = (EStructuralFeature)feature;

-			realEditedObject = editedElement;

-		} else {

-			final String id = AxisUtils.getPropertyId(this.axisElement);

-			stereotypesWithEditedFeatureAppliedOnElement = UMLTableUtils.getAppliedSteretoypesWithThisProperty(editedElement, id);

-			stereotype = stereotypesWithEditedFeatureAppliedOnElement.get(0);

-			realEditedObject = editedElement.getStereotypeApplication(stereotypesWithEditedFeatureAppliedOnElement.get(0));

-			Property prop = UMLTableUtils.getRealStereotypeProperty(editedElement, id);

-			realFeature = realEditedObject.eClass().getEStructuralFeature(prop.getName());

-		}

-		if(stereotypesWithEditedFeatureAppliedOnElement != null && stereotypesWithEditedFeatureAppliedOnElement.size() > 1) {

-			//FIXME : not yet managed

-		} else {

-			this.dialog = createDialog(realEditedObject, realFeature, stereotype, editedElement.eResource().getResourceSet());

-		}

-		return this.dialog;

-	}

-

-	/**

-	 * 

-	 * @param realEditedObject

-	 *        the real edited object : the stereotype application or the edited Element

-	 * @param realFeature

-	 *        the real edited feature : the feature of the stereotype application or the the feature of the edited Element

-	 * @param stereotype

-	 *        the stereotype if we are are editing a stereotype application

-	 * @param resourceSet

-	 *        the resourceset

-	 * @return

-	 *         the dialog to edit the property

-	 */

-	protected Object createDialog(EObject realEditedObject, EStructuralFeature realFeature, Stereotype stereotype, ResourceSet resourceSet) {

-		final UMLContentProvider p = new UMLContentProvider(realEditedObject, realFeature, stereotype, resourceSet);

-		final String title = realFeature.getName();

-		final boolean unique = realFeature.isUnique();

-		final boolean ordered = realFeature.isOrdered();

-		final int upperBound = realFeature.getUpperBound();

-		final Object value = realEditedObject.eGet(realFeature);

-		IElementSelector selector = getElementSelector(unique, new UMLLabelProvider(), p);

-		final MultipleValueSelectorDialog dialog = new MultipleValueSelectorDialog(Display.getCurrent().getActiveShell(), selector, title, unique, ordered, upperBound) {

-

-			@Override

-			protected void okPressed() {

-				super.okPressed();

-				Collection<Object> newValue = new ArrayList<Object>();

-				Object[] result = this.getResult();

-				for(Object object : result) {

-					newValue.add(object);

-

-				}

-				AbstractUMLMultiValueCellEditor.this.returnedValue = newValue;

-				AbstractUMLMultiValueCellEditor.this.editHandler.commit(newValue, MoveDirectionEnum.NONE);

-			}

-

-		};

-		dialog.setLabelProvider(new UMLLabelProvider());

-		if(value != null && value instanceof Collection) {

-			Collection<?> coll = (Collection<?>)value;

-			if(!coll.isEmpty()) {

-				dialog.setInitialSelections(coll.toArray());

-			}

-		}

-

-		ReferenceValueFactory factory = getFactory();

-		if(factory != null) {

-			dialog.setFactory(factory);

-		}

-

-		return dialog;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the reference factory used to create to element

-	 */

-	protected abstract ReferenceValueFactory getFactory();

-

-	/**

-	 * 

-	 * @param isUnique

-	 * @param labelProvider

-	 * @param contentProvider

-	 * @return

-	 *         the element selector to use in the dialog

-	 */

-	//FIXME : remove the label provider?!

-	protected abstract IElementSelector getElementSelector(final boolean isUnique, final ILabelProvider labelProvider, final IStaticContentProvider contentProvider);

-

-	@Override

-	public Object getDialogInstance() {

-		return this.dialog;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor#getEditorValue()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Object getEditorValue() {

-		return this.returnedValue;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor#setEditorValue(java.lang.Object)

-	 * 

-	 * @param value

-	 */

-	@Override

-	public void setEditorValue(Object value) {

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor#close()

-	 * 

-	 */

-	@Override

-	public void close() {

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.gui.AbstractDialogCellEditor#isClosed()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean isClosed() {

-		return false;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiBooleanCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiBooleanCellEditor.java
deleted file mode 100644
index f89cf6729f8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiBooleanCellEditor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.widgets.creation.BooleanEditionFactory;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.BooleanSelector;

-

-/**

- * CellEditor for multivalued integer

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class MultiBooleanCellEditor extends AbstractUMLMultiValueCellEditor {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 * @param elementProvider

-	 */

-	public MultiBooleanCellEditor(Object axisElement, ITableAxisElementProvider elementProvider) {

-		super(axisElement, elementProvider);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.editor.AbstractUMLMultiValueCellEditor#getElementSelector(boolean,

-	 *      org.eclipse.jface.viewers.ILabelProvider, org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider)

-	 * 

-	 * @param isUnique

-	 * @param labelProvider

-	 * @param contentProvider

-	 * @return

-	 */

-	@Override

-	protected IElementSelector getElementSelector(boolean isUnique, ILabelProvider labelProvider, IStaticContentProvider contentProvider) {

-		return new BooleanSelector();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.editor.AbstractUMLMultiValueCellEditor#getFactory()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected ReferenceValueFactory getFactory() {

-		return new BooleanEditionFactory();

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiEnumCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiEnumCellEditor.java
deleted file mode 100644
index 61f9d908b29..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiEnumCellEditor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;

-

-/**

- * CellEditor for multivalued Enumeration

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class MultiEnumCellEditor extends AbstractUMLMultiValueCellEditor {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 * @param elementProvider

-	 */

-	public MultiEnumCellEditor(Object axisElement, ITableAxisElementProvider elementProvider) {

-		super(axisElement, elementProvider);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.celleditor.AbstractUMLMultiValueCellEditor#getElementSelector(boolean,

-	 *      org.eclipse.jface.viewers.ILabelProvider, org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider)

-	 * 

-	 * @param isUnique

-	 * @param labelProvider

-	 * @param contentProvider

-	 * @return

-	 */

-	@Override

-	protected IElementSelector getElementSelector(boolean isUnique, ILabelProvider labelProvider, IStaticContentProvider contentProvider) {

-		final ReferenceSelector selector = new ReferenceSelector(isUnique);

-		selector.setContentProvider(contentProvider);

-		selector.setLabelProvider(new UMLLabelProvider());//FIXME

-		return selector;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.celleditor.AbstractUMLMultiValueCellEditor#getFactory()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected ReferenceValueFactory getFactory() {

-		return null;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiIntegerCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiIntegerCellEditor.java
deleted file mode 100644
index 59f5f52b670..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiIntegerCellEditor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.widgets.creation.IntegerEditionFactory;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;

-

-/**

- * CellEditor for multivalued integer

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class MultiIntegerCellEditor extends AbstractUMLMultiValueCellEditor {

-

-	public MultiIntegerCellEditor(Object axisElement, ITableAxisElementProvider elementProvider) {

-		super(axisElement, elementProvider);

-	}

-

-	@Override

-	protected IElementSelector getElementSelector(boolean isUnique, ILabelProvider labelProvider, IStaticContentProvider contentProvider) {

-		return new IntegerSelector();

-	}

-

-	@Override

-	protected ReferenceValueFactory getFactory() {

-		return new IntegerEditionFactory();

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiRealCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiRealCellEditor.java
deleted file mode 100644
index 7a57255d957..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiRealCellEditor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.widgets.creation.RealEditionFactory;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.RealSelector;

-import org.eclipse.papyrus.infra.widgets.validator.RealInputValidator;

-

-

-public class MultiRealCellEditor extends AbstractUMLMultiValueCellEditor {

-

-	public MultiRealCellEditor(Object axisElement, ITableAxisElementProvider elementProvider) {

-		super(axisElement, elementProvider);

-	}

-

-	@Override

-	protected IElementSelector getElementSelector(boolean isUnique, ILabelProvider labelProvider, IStaticContentProvider contentProvider) {

-		return new RealSelector();

-	}

-

-	@Override

-	protected ReferenceValueFactory getFactory() {

-		return new RealEditionFactory(new RealInputValidator());

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiReferenceCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiReferenceCellEditor.java
deleted file mode 100644
index 32095677a00..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiReferenceCellEditor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;

-

-/**

- * CellEditor for multivalued references

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class MultiReferenceCellEditor extends AbstractUMLMultiValueCellEditor {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 * @param elementProvider

-	 */

-	public MultiReferenceCellEditor(Object axisElement, ITableAxisElementProvider elementProvider) {

-		super(axisElement, elementProvider);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.celleditor.AbstractUMLMultiValueCellEditor#getFactory()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected ReferenceValueFactory getFactory() {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.celleditor.AbstractUMLMultiValueCellEditor#getElementSelector(boolean,

-	 *      org.eclipse.jface.viewers.ILabelProvider, org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider)

-	 * 

-	 * @param isUnique

-	 * @param labelProvider

-	 * @param contentProvider

-	 * @return

-	 */

-	@Override

-	protected IElementSelector getElementSelector(final boolean isUnique, final ILabelProvider labelProvider, final IStaticContentProvider contentProvider) {

-		final ReferenceSelector selector = new ReferenceSelector(isUnique);

-		selector.setContentProvider(contentProvider);

-		selector.setLabelProvider(new UMLLabelProvider());//FIXME

-		return selector;

-	}

-

-

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiStringCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiStringCellEditor.java
deleted file mode 100644
index 1c05dd50002..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiStringCellEditor.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;

-

-/**

- * The Multi String Cell Editor

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class MultiStringCellEditor extends AbstractUMLMultiValueCellEditor {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 * @param elementProvider

-	 */

-	public MultiStringCellEditor(Object axisElement, ITableAxisElementProvider elementProvider) {

-		super(axisElement, elementProvider);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.editor.AbstractUMLMultiValueCellEditor#getFactory()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected ReferenceValueFactory getFactory() {

-		return new StringEditionFactory();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.editor.AbstractUMLMultiValueCellEditor#getElementSelector(boolean,

-	 *      org.eclipse.jface.viewers.ILabelProvider, org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider)

-	 * 

-	 * @param isUnique

-	 * @param labelProvider

-	 * @param contentProvider

-	 * @return

-	 */

-	@Override

-	protected IElementSelector getElementSelector(boolean isUnique, ILabelProvider labelProvider, IStaticContentProvider contentProvider) {

-		return new StringSelector();

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiUnlimitedNaturalCellEditor.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiUnlimitedNaturalCellEditor.java
deleted file mode 100644
index e266e164f16..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiUnlimitedNaturalCellEditor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.editor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.creation.UnlimitedNaturalEditionFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;

-

-/**

- * CellEditor for multivalued unlimited natural

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class MultiUnlimitedNaturalCellEditor extends AbstractUMLMultiValueCellEditor {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 * @param elementProvider

-	 */

-	public MultiUnlimitedNaturalCellEditor(Object axisElement, ITableAxisElementProvider elementProvider) {

-		super(axisElement, elementProvider);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.celleditor.AbstractUMLMultiValueCellEditor#getElementSelector(boolean,

-	 *      org.eclipse.jface.viewers.ILabelProvider, org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider)

-	 * 

-	 * @param isUnique

-	 * @param labelProvider

-	 * @param contentProvider

-	 * @return

-	 */

-	@Override

-	protected IElementSelector getElementSelector(boolean isUnique, ILabelProvider labelProvider, IStaticContentProvider contentProvider) {

-		return new IntegerSelector();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.nattable.celleditor.AbstractUMLMultiValueCellEditor#getFactory()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected ReferenceValueFactory getFactory() {

-		return new UnlimitedNaturalEditionFactory();

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLElementAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLElementAxisManager.java
deleted file mode 100644
index 695ebe2dd3b..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLElementAxisManager.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.manager.axis;

-

-import org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectAxisManager;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * 

- * This axis manager restrict the allowed contents to UML Element

- * 

- */

-public class UMLElementAxisManager extends EObjectAxisManager {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectAxisManager#isAllowedContents(java.lang.Object)

-	 * 

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		boolean value = super.isAllowedContents(object);

-		if(value) {

-			return object instanceof Element;

-		}

-		return value;

-	}

-

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return true;//FIXME : must be true only for uml elements

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLFeatureAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLFeatureAxisManager.java
deleted file mode 100644
index f8d6c2cd0ce..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLFeatureAxisManager.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.papyrus.uml.nattable.manager.axis;

-

-import java.util.Collection;

-import java.util.HashSet;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.emf.nattable.manager.axis.EStructuralFeatureAxisManager;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.uml.nattable.provider.UMLFeatureRestrictedContentProvider;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * 

- * This UML feature provider allows to ignore the feature EAnnotation

- * 

- */

-public class UMLFeatureAxisManager extends EStructuralFeatureAxisManager {

-

-	@Override

-	public boolean isAllowedContents(Object object) {

-		boolean value = super.isAllowedContents(object);

-		if(value) {

-			return object != EcorePackage.eINSTANCE.getEModelElement_EAnnotations();

-		}

-		return value;

-	}

-

-	@Override

-	public Collection<Object> getAllPossibleAxis() {

-		Collection<Object> classes = new HashSet<Object>();

-		classes.add(UMLPackage.eINSTANCE);

-		return classes;

-	}

-

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-		return new UMLFeatureRestrictedContentProvider(this, isRestricted);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLStereotypePropertyAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLStereotypePropertyAxisManager.java
deleted file mode 100644
index d404cedefcb..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLStereotypePropertyAxisManager.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;

-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.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.uml.nattable.provider.UMLStereotypeRestrictedPropertyContentProvider;

-import org.eclipse.papyrus.uml.nattable.utils.Constants;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * This axis manager provides the axis for properties of stereotypes

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class UMLStereotypePropertyAxisManager extends AbstractAxisManager {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getComplementaryAddAxisCommand(final EditingDomain domain, final Collection<Object> objectToAdd) {

-		final Set<Stereotype> appliedStereotypes = new HashSet<Stereotype>();

-		for(final Object current : objectToAdd) {

-			if(current instanceof Element) {

-				appliedStereotypes.addAll(((Element)current).getAppliedStereotypes());

-			}

-		}

-		final Set<Property> allProperties = new HashSet<Property>();

-		final Set<Class> extendedMetaclass = new HashSet<Class>();

-		for(final Stereotype stereotype : appliedStereotypes) {

-			allProperties.addAll(stereotype.getAllAttributes());

-			extendedMetaclass.addAll(stereotype.getAllExtendedMetaclasses());

-		}

-

-		//FIXME move me in a util class

-		List<Object> propertiesToAdd = new ArrayList<Object>();

-		for(Property property : allProperties) {//FIXME move this test

-			Association association = property.getAssociation();

-			if(association instanceof Extension) {

-				Extension ext = (Extension)association;

-				Class metaClass = ext.getMetaclass();

-				if(property.getName().equals("base_" + metaClass.getName())) {

-					continue;

-				}

-			}

-			propertiesToAdd.add(property);

-		}

-		if(!propertiesToAdd.isEmpty()) {

-			return getAddAxisCommand(domain, propertiesToAdd);

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getAddAxisCommand(EditingDomain domain, Collection<Object> objectToAdd) {

-		final List<String> allPropertyQN = new ArrayList<String>();

-		for(Object object : objectToAdd) {

-			if(object instanceof Property) {

-

-				allPropertyQN.add(Constants.PROPERTY_OF_STEREOTYPE_PREFIX + ((NamedElement)object).getQualifiedName());

-			}

-		}

-		allPropertyQN.removeAll(getTableManager().getElementsList(getRepresentedContentProvider()));

-		if(!allPropertyQN.isEmpty()) {

-			final Collection<IAxis> toAdd = new ArrayList<IAxis>();

-			for(String propQN : allPropertyQN) {

-				final IdAxis newAxis = NattableaxisFactory.eINSTANCE.createFeatureIdAxis();

-				newAxis.setElement(propQN);

-				newAxis.setManager(this.representedAxisManager);

-				toAdd.add(newAxis);

-			}

-			//FIXME : we must use a factory and use the service edit

-			return AddCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), toAdd);

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 * 

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @param objectsToAdd

-	 * @param index

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canInsertAxis(EditingDomain, java.util.Collection, int)

-	 * 

-	 * @return

-	 */

-

-	public boolean canInsertAxis(EditingDomain domain, Collection<Object> objectsToAdd, int index) {

-		return false;

-	}

-

-	/**

-	 * return the content provider for the stereotypes properties

-	 */

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-		AbstractAxisProvider secondAxis = ((INattableModelManager)getTableManager()).getHorizontalAxisProvider();

-		if(secondAxis == getRepresentedContentProvider()) {

-			secondAxis = ((INattableModelManager)getTableManager()).getVerticalAxisProvider();

-		}

-		List<Object> allObjectsInTable = getTableManager().getElementsList(secondAxis);

-		HashSet<Profile> profiles = new HashSet<Profile>();

-		for(Object object : allObjectsInTable) {

-			if(object instanceof Element) {

-				Element element = (Element)object;

-				List<Stereotype> appliedStereotypes = element.getAppliedStereotypes();

-				for(Stereotype stereotype : appliedStereotypes) {

-					profiles.add((Profile)EcoreUtil.getRootContainer(stereotype));

-				}

-

-			}

-		}

-

-		IRestrictedContentProvider umlStereotypePropertyContentProvider = new UMLStereotypeRestrictedPropertyContentProvider(this, new ArrayList(profiles));

-		umlStereotypePropertyContentProvider.setRestriction(isRestricted);

-		return umlStereotypePropertyContentProvider;

-

-	}

-

-	public Collection<Object> getAllPossibleAxis() {

-		return getRootProfiles();

-	}

-

-	public Collection<Object> getRootProfiles() {

-		EObject context = ((INattableModelManager)getTableManager()).getTable().getContext();

-		assert context instanceof Element;

-

-		EList<Profile> allAppliedProfiles = ((Element)context).getNearestPackage().getAllAppliedProfiles();

-		Collection<Object> profiles = new HashSet<Object>();

-		for(Profile profile : allAppliedProfiles) {

-			EObject rootContainer = EcoreUtil.getRootContainer(profile);

-			profiles.add(rootContainer);

-		}

-		return profiles;

-

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.util.Collection)

-	 * 

-	 * @param domain

-	 * @param umlProperties

-	 *        the UML Property for which we want destroy axis

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisCommand(EditingDomain domain, Collection<Object> umlProperties) {

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());

-		final CompositeCommand compositeCommand = new CompositeCommand("Destroy IAxis Command");

-		final List<String> propIdToDestroy = new ArrayList<String>();

-		for(final Object current : umlProperties) {

-			if(current instanceof Property && ((Property)current).eContainer() instanceof Stereotype) {

-				propIdToDestroy.add(Constants.PROPERTY_OF_STEREOTYPE_PREFIX + ((NamedElement)current).getQualifiedName());

-			}

-		}

-

-		for(final IAxis current : getRepresentedContentProvider().getAxis()) {

-			if(current instanceof IdAxis) {

-				String propId = AxisUtils.getPropertyId(current);

-				if(propIdToDestroy.contains(propId)) {

-					DestroyElementRequest request = new DestroyElementRequest((TransactionalEditingDomain)domain, current, false);

-					compositeCommand.add(provider.getEditCommand(request));

-				}

-			}

-		}

-

-		if(!compositeCommand.isEmpty()) {

-			return new GMFtoEMFCommandWrapper(compositeCommand);

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Collection<Object> getAllManagedAxis() {

-		Set<Object> eObjects = new HashSet<Object>();

-		final List<Object> elementList = (getTableManager().getElementsList(getRepresentedContentProvider()));

-		for(final Object element : elementList) {

-			if(element instanceof IAxis && ((IAxis)element).getManager() == this.representedAxisManager) {

-				EObject context = ((INattableModelManager)getTableManager()).getTable().getContext();

-				String id = null;

-				IdAxis idAxis = (IdAxis)element;

-				id = idAxis.getElement();

-				Property property = UMLTableUtils.getRealStereotypeProperty(context, id);

-				if(property != null) {

-					eObjects.add(property);

-				} else {

-					eObjects.add(idAxis);

-				}

-			}

-		}

-		return eObjects;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ISubAxisManager#isDynamic()

-	 * 

-	 * @return

-	 */

-	public boolean isDynamic() {

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 * 

-	 * @return

-	 */

-	public boolean isSlave() {

-		return true;

-	}

-

-	public boolean canEditAxisHeader() {

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

-	 * 

-	 * @param axis

-	 * @return

-	 */

-	public boolean canDestroyAxisElement(IAxis axis) {

-		return false;

-	}

-

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		return false;

-	}

-

-	public Command getDestroyAxisElementCommand(EditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
deleted file mode 100644
index 271d5e15edc..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.manager.cell;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.uml.nattable.utils.Constants;

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Stereotype;

-

-//FIXME : move this class to remove UML dependency

-public class StereotypePropertyCellManager implements ICellManager {

-

-	//FIXME : remove me!

-	public static final String STEREOTYPE_PREFIX = "property_of_stereotype:/";

-

-	public boolean handles(final Object obj1, final Object obj2) {

-		return organizeObject(obj1, obj2).size() == 2;

-	}

-

-	public Object getValue(final Object obj1, final Object obj2) {

-		final List<Object> elements = organizeObject(obj1, obj2);

-		final Object el = elements.get(0);

-		if(el instanceof Element) {

-			String propertyQualifiedName = (String)elements.get(1);

-			propertyQualifiedName = propertyQualifiedName.substring(Constants.PROPERTY_OF_STEREOTYPE_PREFIX.length(), propertyQualifiedName.length());

-			final String stereotypeQN = NamedElementUtil.getParentQualifiedName(propertyQualifiedName);

-			final String propertyName = NamedElementUtil.getNameFromQualifiedName(propertyQualifiedName);

-			final Stereotype ste = ((Element)el).getAppliedStereotype(stereotypeQN);

-

-			//FIXME : case where the property comes from a super class not managed

-			//FIXME : case a stereotype and a super stereotype with the same property is applied not managed

-			if(ste != null) {

-				return ((Element)el).getValue(ste, propertyName);

-			}

-

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	protected List<Object> organizeObject(final Object obj1, final Object obj2) {

-		final List<Object> objects = new ArrayList<Object>();

-		if(obj1 instanceof String && ((String)obj1).startsWith(Constants.PROPERTY_OF_STEREOTYPE_PREFIX)) {

-			objects.add(obj2);

-			objects.add(obj1);

-		} else if(obj2 instanceof String && ((String)obj2).startsWith(Constants.PROPERTY_OF_STEREOTYPE_PREFIX)) {

-			objects.add(obj1);

-			objects.add(obj2);

-		}

-		return objects;

-	}

-

-	public void setValue(EditingDomain domain, Object rowElement, Object lineElement, Object newValue) {

-		// TODO Auto-generated method stub

-

-	}

-

-	public boolean isCellEditable(Object obj1, Object obj2) {

-		// TODO Auto-generated method stub

-		return true;

-	}

-

-	public Command getSetValueCommand(EditingDomain domain, Object rowElement, Object lineElement, Object newValue) {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	public ICellEditor getCellEditor(Table table, Object obj1) {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	public boolean handlesAxisElement(Object obj) {

-		// TODO Auto-generated method stub

-		return false;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/UMLFeatureCellManager.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/UMLFeatureCellManager.java
deleted file mode 100644
index 4a17e040741..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/UMLFeatureCellManager.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.manager.cell;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * 

- * @author Vincent Lorenzo

- *         This cell manager allows to display properties of stereotypes and execute the set value command

- */

-public class UMLFeatureCellManager extends EMFFeatureValueCellManager {

-

-	/**

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 *         2 objects if this manager is able to manage it : the first one is the edited EObject, the 2nd one is the edited feature (or a string

-	 *         representing it)

-	 */

-	protected List<Object> organizeUMLObject(Object obj1, Object obj2) {

-		final List<Object> objects = new ArrayList<Object>();

-		if(obj1 instanceof IAxis) {

-			obj1 = ((IAxis)obj1).getElement();

-		}

-		if(obj2 instanceof IAxis) {

-			obj2 = ((IAxis)obj2).getElement();

-		}

-		if(obj2 instanceof Element) {

-			objects.add(obj2);

-			objects.add(obj1);

-		} else if(obj1 instanceof Element) {

-			objects.add(obj1);

-			objects.add(obj2);

-		}

-

-		if(objects.size() == 2) {

-			final Object property = objects.get(1);

-			String id = "";

-			if(property instanceof IdAxis) {

-				id = ((IdAxis)property).getElement();

-				objects.remove(property);

-				objects.add(id);

-			} else if(property instanceof String) {

-				id = (String)property;

-			}

-			if(!id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {

-				return Collections.emptyList();

-			}

-		} else {

-			return Collections.emptyList();

-		}

-		return objects;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager#handles(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	@Override

-	public boolean handles(Object obj1, Object obj2) {

-		final List<EObject> objects = organizeObject(obj1, obj2);

-		if(objects.size() == 2) {

-			final EStructuralFeature feature = (EStructuralFeature)objects.get(1);

-			final EObject featureContainer = feature.eContainer();

-			if(UMLPackage.eINSTANCE.eContents().contains(featureContainer)) {

-				return true;

-			}

-		}

-		return organizeUMLObject(obj1, obj2).size() == 2;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager#handlesAxisElement(java.lang.Object)

-	 * 

-	 * @param obj

-	 * @return

-	 */

-	@Override

-	public boolean handlesAxisElement(Object obj) {

-		if(super.handlesAxisElement(obj)) {

-			if(obj instanceof EStructuralFeatureAxis) {

-				obj = ((EStructuralFeatureAxis)obj).getElement();

-			}

-			final EStructuralFeature feature = (EStructuralFeature)obj;

-			EObject featureContainer = feature.eContainer();

-			if(UMLPackage.eINSTANCE.eContents().contains(featureContainer)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager#getValue(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	@Override

-	public Object getValue(Object obj1, Object obj2) {

-		if(super.handles(obj1, obj2)) {

-			return super.getValue(obj1, obj2);

-		} else {

-			final List<Object> umlObjects = organizeUMLObject(obj1, obj2);

-			if(umlObjects.size() == 2) {

-				final Element el = (Element)umlObjects.get(0);

-				final String id = (String)umlObjects.get(1);

-				final Property prop = UMLTableUtils.getRealStereotypeProperty(el, id);

-				final List<Stereotype> stereotypesWithThisProperty = UMLTableUtils.getAppliedSteretoypesWithThisProperty(el, id);

-				if(stereotypesWithThisProperty.size() == 1) {

-					return el.getValue(stereotypesWithThisProperty.get(0), prop.getName());

-				} else if(stereotypesWithThisProperty.size() > 1) {

-					return "Several stereotypes with this feature are applied -> not yet managed";

-				}

-			}

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager#setValue(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Object, java.lang.Object, java.lang.Object)

-	 * 

-	 * @param domain

-	 * @param obj1

-	 * @param obj2

-	 * @param newValue

-	 */

-	@Override

-	public void setValue(EditingDomain domain, Object obj1, Object obj2, Object newValue) {

-		if(super.handles(obj1, obj2)) {

-			super.setValue(domain, obj1, obj2, newValue);

-		} else {

-			final Command cmd = getSetValueCommand(domain, obj1, obj2, newValue);

-			if(cmd != null) {

-				domain.getCommandStack().execute(cmd);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager#getSetValueCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      java.lang.Object, java.lang.Object, java.lang.Object)

-	 * 

-	 * @param domain

-	 * @param obj1

-	 * @param obj2

-	 * @param newValue

-	 * @return

-	 */

-	@Override

-	public Command getSetValueCommand(EditingDomain domain, Object obj1, Object obj2, Object newValue) {

-		if(super.handles(obj1, obj2)) {

-			return super.getSetValueCommand(domain, obj1, obj2, newValue);

-		} else {

-			final List<Object> umlObjects = organizeUMLObject(obj1, obj2);

-			final Element el = (Element)umlObjects.get(0);

-			final String id = (String)umlObjects.get(1);

-			final Property prop = UMLTableUtils.getRealStereotypeProperty(el, id);

-			List<Stereotype> stereotypes = UMLTableUtils.getAppliedSteretoypesWithThisProperty(el, id);

-			if(prop != null) {

-				if(stereotypes.size() == 1) {

-					final EObject stereotypeApplication = el.getStereotypeApplication(stereotypes.get(0));

-					final EStructuralFeature steApFeature = stereotypeApplication.eClass().getEStructuralFeature(prop.getName());

-					final AbstractEditCommandRequest request = new SetRequest((TransactionalEditingDomain)domain, stereotypeApplication, steApFeature, newValue);

-					final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(stereotypeApplication);

-					final ICommand editCommand = provider.getEditCommand(request);

-					return new GMFtoEMFCommandWrapper(editCommand);

-				} else {

-					//FIXME : not yet managed

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager#isCellEditable(java.lang.Object, java.lang.Object)

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 *         if the edited feature is an EMF feature -> see {@link EMFFeatureValueCellManager} else if the edited feature is a stereotype property :

-	 *         return true if the stereotype is applied on the edited element AND if only one stereotype with this property is applied on the element

-	 */

-	@Override

-	public boolean isCellEditable(Object obj1, Object obj2) {

-		if(super.handles(obj1, obj2)) {

-			return super.isCellEditable(obj1, obj2);

-		} else {

-			final List<Object> umlObjects = organizeUMLObject(obj1, obj2);

-			final Element el = (Element)umlObjects.get(0);

-			final String id = (String)umlObjects.get(1);

-			switch(UMLTableUtils.getAppliedSteretoypesWithThisProperty(el, id).size()) {

-			case 1:

-				final Property prop = UMLTableUtils.getRealStereotypeProperty(el, id);

-				return !prop.isDerived();

-			}

-		}

-		return false;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java
deleted file mode 100644
index ad29531cc4c..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.papyrus.uml.nattable.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.nattable.messages.messages"; //$NON-NLS-1$

-

-	public static String StereotypePropertyHeaderLabelProvider_RequiredProfileNotFound;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/messages.properties b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/messages.properties
deleted file mode 100644
index 2e5815723a9..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-StereotypePropertyHeaderLabelProvider_RequiredProfileNotFound=Required Profile Not Found

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/AbstractUMLNattableCellLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/AbstractUMLNattableCellLabelProvider.java
deleted file mode 100644
index 9ac67e14962..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/AbstractUMLNattableCellLabelProvider.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.provider;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * Abstract Class for UML Cell provider

- * 

- * @author Vincent Lorenzo

- * 

- */

-public abstract class AbstractUMLNattableCellLabelProvider extends GenericCellLabelProvider {

-

-

-	/**

-	 * 

-	 * @param obj1

-	 *        the first Object

-	 * @param obj2

-	 *        the second Obejct

-	 * @return

-	 *         a list of 2 elements when

-	 *         <ul>

-	 *         <li>the first obejct is an instanceof Element</li>

-	 *         <li>the second object is an UML EstructuralFeature or the real property if we are working with a property of steretoype</li>

-	 *         </ul>

-	 *         or <code>null</code> if the conditions are not satisfied

-	 */

-	protected List<Object> getUMLObjects(final Object obj1, final Object obj2) {//FIXME do a util method for that?

-		List<Object> objects = new ArrayList<Object>();

-		if(obj1 instanceof Element) {

-			objects.add(obj1);

-			objects.add(obj2);

-		} else if(obj2 instanceof Element) {

-			objects.add(obj2);

-			objects.add(obj1);

-		}

-		if(objects.size() == 2) {

-			Object feature = objects.get(1);

-			String id = AxisUtils.getPropertyId(feature);

-			if(id != null) {

-				if(id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX)) {

-					Property prop = UMLTableUtils.getRealStereotypeProperty((EObject)objects.get(0), id);

-					if(prop != null) {

-						objects.remove(1);

-						objects.add(prop);

-					} else {

-						objects = Collections.emptyList();

-					}

-				}

-			} else if(feature instanceof EStructuralFeature) {

-				final EObject featureContainer = ((EStructuralFeature)feature).eContainer();

-				if(!UMLPackage.eINSTANCE.eContents().contains(featureContainer)) {

-					objects = Collections.emptyList();

-				}

-			}

-		} else {

-			objects = Collections.emptyList();

-		}

-		return objects;

-

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java
deleted file mode 100644
index 94d2275f989..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.provider;

-

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

-import org.eclipse.uml2.uml.Property;

-

-

-public class StereotypePropertyCellLabelProvider extends AbstractUMLNattableCellLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderCellContextElement) {

-			final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

-			final IConfigRegistry registry = ((ILabelProviderContextElement)element).getConfigRegistry();

-

-			//now it is possible that we accepts the element

-			final Object rowObject = getRowObject(cell, registry);

-			final Object columnObject = getColumnObject(cell, registry);

-

-			final List<Object> objects = getUMLObjects(rowObject, columnObject);

-			if(objects.size() == 2) {

-				final Object feature = objects.get(1);

-				return feature instanceof Property;

-			}

-		}

-		return false;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
deleted file mode 100644
index 134eb960e54..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.provider;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;

-import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.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.ILabelProviderContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.uml.nattable.messages.Messages;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.uml2.uml.AggregationKind;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * 

- * @author Vincent Lorenzo

- *         This label provider is called to display the properties of stereotype application in the headers of the table

- */

-public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {

-

-	/** The string displayed in the header when the required profile is not avalaible */

-	public static final String REQUIRED_PROFILE_NOT_AVALAIBLE = Messages.StereotypePropertyHeaderLabelProvider_RequiredProfileNotFound;

-

-	/** the icon for the shared aggregation */

-	public static final String AGGREG_SHARED = "icons/aggreg_shared.gif"; //$NON-NLS-1$

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 *         <code>true</code> when element represents a property of a stereotype

-	 */

-	@Override

-	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

-			final Object value = ((ILabelProviderContextElement)element).getObject();

-			String id = AxisUtils.getPropertyId(value);

-			return (id != null && id.startsWith(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX));

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		ILabelProviderConfiguration conf = null;

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		if(element instanceof LabelProviderCellContextElement) {

-			INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			LabelStack labels = ((LabelProviderCellContextElement)element).getCell().getConfigLabels();

-			if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-				conf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(manager.getTable());

-			} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-				conf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(manager.getTable());

-			}

-

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

-			return "";

-		}

-		final Object value = ((ILabelProviderContextElement)element).getObject();

-		final INattableModelManager modelManager = (INattableModelManager)getAxisContentProvider(configRegistry);

-		final EObject tableContext = modelManager.getTable().getContext();

-		String id = AxisUtils.getPropertyId(value);

-		final Property prop = UMLTableUtils.getRealStereotypeProperty(tableContext, id);

-		if(prop != null) {

-			return getText((FeatureLabelProviderConfiguration)conf, configRegistry, prop.getName(), prop.getType(), prop.isDerived(), prop.getLower(), prop.getUpper());

-		} else {

-			id = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$

-			return id + " " + REQUIRED_PROFILE_NOT_AVALAIBLE; //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object element) {

-		final Object value = ((ILabelProviderContextElement)element).getObject();

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElement)element).getConfigRegistry();

-		final INattableModelManager modelManager = (INattableModelManager)getAxisContentProvider(configRegistry);

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			LabelStack labels = ((LabelProviderCellContextElement)element).getCell().getConfigLabels();

-			if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-				conf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(manager.getTable());

-			} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-				conf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(manager.getTable());

-			}

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

-			return null;

-		}

-

-		final EObject tableContext = modelManager.getTable().getContext();

-		String id = AxisUtils.getPropertyId(value);

-		final Property prop = UMLTableUtils.getRealStereotypeProperty(tableContext, id);

-		if(prop != null) {

-			final Type type = prop.getType();

-			if(type instanceof DataType) {

-				return EStructuralFeatureImageRegistry.getAttributeIcon();

-			}

-			switch(prop.getAggregation().getValue()) {

-			case AggregationKind.NONE:

-				return EStructuralFeatureImageRegistry.getLinkIcon();

-			case AggregationKind.COMPOSITE:

-				return EStructuralFeatureImageRegistry.getAggregIcon();

-			case AggregationKind.SHARED:

-				return Activator.getDefault().getImage(org.eclipse.papyrus.uml.nattable.Activator.PLUGIN_ID, AGGREG_SHARED);

-			}

-		}

-		return null;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java
deleted file mode 100644
index ddd51702ae3..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractRestrictedContentProvider;

-import org.eclipse.papyrus.uml.nattable.manager.axis.UMLFeatureAxisManager;

-import org.eclipse.uml2.uml.UMLPackage;

-

-public class UMLFeatureRestrictedContentProvider extends AbstractRestrictedContentProvider {

-

-	private final UMLFeatureAxisManager umlFeatureAxisManager;

-

-	public UMLFeatureRestrictedContentProvider(UMLFeatureAxisManager umlFeatureAxisManager, boolean isRestricted) {

-		super(isRestricted);

-		this.umlFeatureAxisManager = umlFeatureAxisManager;

-	}

-

-	public Object[] getElements(Object inputElement) {

-		Collection<Object> elementsToShow;

-		elementsToShow = this.umlFeatureAxisManager.getAllPossibleAxis();

-		return elementsToShow.toArray();

-	}

-

-	protected AbstractAxisProvider getManagedAxisProvider() {

-		return this.umlFeatureAxisManager.getRepresentedContentProvider();

-	}

-

-	protected AbstractAxisProvider getSecondAxisProvider() {

-		AbstractAxisProvider secondAxisProvider = this.umlFeatureAxisManager.getTableManager().getVerticalAxisProvider();

-		if(secondAxisProvider == this.umlFeatureAxisManager) {

-			secondAxisProvider = this.umlFeatureAxisManager.getTableManager().getHorizontalAxisProvider();

-		}

-		return secondAxisProvider;

-	}

-

-	public Object[] getChildren(Object parentElement) {

-		List<Object> asList = new ArrayList<Object>();

-		if(parentElement instanceof EClass) {

-			EClass eClass = (EClass)parentElement;

-			asList.addAll(eClass.getEStructuralFeatures());

-			return asList.toArray();

-		} else if(parentElement instanceof EPackage) {

-			EPackage ePackage = (EPackage)parentElement;

-			Collection<EClassifier> eClassifiers = null;

-			if(this.isRestricted) {

-				eClassifiers = new HashSet<EClassifier>();

-				AbstractAxisProvider axisProvider = ((INattableModelManager)this.umlFeatureAxisManager.getTableManager()).getHorizontalAxisProvider();

-				if(axisProvider == this.umlFeatureAxisManager.getRepresentedContentProvider()) {

-					axisProvider = ((INattableModelManager)this.umlFeatureAxisManager.getTableManager()).getVerticalAxisProvider();

-				}

-				List<Object> elementsList = this.umlFeatureAxisManager.getTableManager().getElementsList(axisProvider);

-				for(Object object : elementsList) {

-					if(object instanceof EObject) {

-						EObject eObject = (EObject)object;

-						if(eObject instanceof EObjectAxis) {

-							eObject = ((EObjectAxis)eObject).getElement();

-						}

-						EClass eClass = eObject.eClass();

-						eClassifiers.add(eClass);

-						eClassifiers.addAll(eClass.getEAllSuperTypes());

-					}

-				}

-			} else {

-				eClassifiers = ePackage.getEClassifiers();

-			}

-			for(EClassifier eClassifier : eClassifiers) {

-				if(eClassifier instanceof EClass) {

-					asList.add(eClassifier);

-				}

-			}

-			return asList.toArray();

-		}

-		return null;

-

-	}

-

-	public Object getParent(Object element) {

-		if(element instanceof EStructuralFeature) {

-			EStructuralFeature feature = (EStructuralFeature)element;

-			return feature.getEContainingClass();

-		} else if(element instanceof EClass) {

-			EClass eClass = (EClass)element;

-			return eClass.getEPackage();

-		}

-		return null;

-	}

-

-	public boolean hasChildren(Object element) {

-		if(element instanceof EClass) {

-			EClass eClass = (EClass)element;

-			boolean hasChildren = !eClass.getEStructuralFeatures().isEmpty();

-			return hasChildren;

-		} else if(element instanceof EPackage) {

-			EPackage ePackage = (EPackage)element;

-			EList<EClassifier> eClassifiers = ePackage.getEClassifiers();

-			for(EClassifier eClassifier : eClassifiers) {

-				if(eClassifier instanceof EClass) {

-					return true;

-				}

-			}

-			return false;

-		} else if(element instanceof EStructuralFeature) {

-			return false;

-		}

-		return false;

-	}

-

-	public Object[] getElements() {

-		return getElements(null);

-	}

-

-	public boolean isValidValue(Object element) {

-		return element instanceof EStructuralFeature && UMLPackage.eINSTANCE.eContents().contains(((EObject)element).eContainer());

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java
deleted file mode 100644
index a4c2059d5aa..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.provider;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.uml.nattable.manager.axis.UMLStereotypePropertyAxisManager;

-import org.eclipse.papyrus.uml.tools.providers.UMLStereotypePropertyContentProvider;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * Restricted Content Provider for the properties of Stereotypes

- * 

- * @author JC236769

- * 

- */

-public class UMLStereotypeRestrictedPropertyContentProvider extends UMLStereotypePropertyContentProvider implements IRestrictedContentProvider {

-

-	private boolean isRestricted;

-

-	private UMLStereotypePropertyAxisManager umlStereotypePropertyManager;

-

-	public UMLStereotypeRestrictedPropertyContentProvider(UMLStereotypePropertyAxisManager umlStereotypePropertyManager, List<Profile> profiles) {

-		super(profiles);

-		this.umlStereotypePropertyManager = umlStereotypePropertyManager;

-	}

-

-	public void setRestriction(boolean isRestricted) {

-		this.isRestricted = isRestricted;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the other axis provider

-	 */

-	protected AbstractAxisProvider getOtherAxisProvider() {

-		AbstractAxisProvider currentProvider = this.umlStereotypePropertyManager.getRepresentedContentProvider();

-		if(currentProvider == this.umlStereotypePropertyManager.getTableManager().getVerticalAxisProvider()) {

-			return this.umlStereotypePropertyManager.getTableManager().getHorizontalAxisProvider();

-		} else {

-			return this.umlStereotypePropertyManager.getTableManager().getVerticalAxisProvider();

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.tools.providers.UMLStereotypePropertyContentProvider#getChildren(java.lang.Object)

-	 * 

-	 * @param parentElement

-	 * @return

-	 */

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		if(parentElement instanceof Profile) {

-			Profile profile = (Profile)parentElement;

-			Set<Stereotype> restrictedStereotypes = new HashSet<Stereotype>();

-			if(this.isRestricted && !profile.getOwnedStereotypes().isEmpty()) {

-				AbstractAxisProvider otherAxisProvider = getOtherAxisProvider();

-				final List<Object> elementsList = this.umlStereotypePropertyManager.getTableManager().getElementsList(otherAxisProvider);

-				for(Object object : elementsList) {

-					if(object instanceof Element) {

-						Element typedElement = (Element)object;

-						EList<Stereotype> appliedStereotypes = typedElement.getAppliedStereotypes();

-						restrictedStereotypes.addAll(appliedStereotypes);

-					}

-				}

-				Set<Stereotype> superSte = new HashSet<Stereotype>();

-				for(Stereotype ste : restrictedStereotypes) {

-					for(final Classifier classifier : ste.getGenerals()) {

-						if(classifier instanceof Stereotype) {

-							superSte.add((Stereotype)classifier);

-						}

-					}

-				}

-				restrictedStereotypes.addAll(superSte);

-				List<Stereotype> toReturn = new ArrayList<Stereotype>(profile.getOwnedStereotypes());

-				List<Stereotype> toRemove = new ArrayList<Stereotype>();

-				for(Object object : toReturn) {

-					if(object instanceof Stereotype) {

-						Stereotype stereotype = (Stereotype)object;

-						if(!restrictedStereotypes.contains(stereotype)) {

-							toRemove.add(stereotype);

-						}

-

-					}

-				}

-				toReturn.removeAll(toRemove);

-				return toReturn.toArray();

-			}

-			Object[] children = super.getChildren(parentElement);

-			return children;

-		}

-		Object[] children = super.getChildren(parentElement);

-		return children;

-

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java
deleted file mode 100644
index 4c0d7e0e6d8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElement;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * This label provider allows to display '*' instead of -1 for unlimitednatural

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class UMLUnlimitedNaturalLabelProvider extends AbstractUMLNattableCellLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderCellContextElement) {

-			final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

-			final IConfigRegistry registry = ((ILabelProviderContextElement)element).getConfigRegistry();

-

-			//we do some quick test on the value

-			final Object value = cell.getDataValue();

-			if(value instanceof Collection<?> && !((Collection<?>)value).iterator().hasNext()) {//if the value is en empty collection, we return false;

-				return false;

-			} else if(!(value instanceof Collection<?>) && !(value instanceof Integer)) { //if the value is not a collection and not an integer, we return false

-				return false;

-			}

-

-			//now it is possible that we accepts the element

-			final Object rowObject = getRowObject(cell, registry);

-			final Object columnObject = getColumnObject(cell, registry);

-

-			final List<Object> objects = getUMLObjects(rowObject, columnObject);

-			if(objects.size() == 2) {

-				final Object feature = objects.get(1);

-				if(feature instanceof Property) {

-					return UMLUtil.isUnlimitedNatural(((Property)feature).getType());

-				}

-			}

-			return false;

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		final String str = super.getText(element);

-		return str.replaceAll(Constants.INFINITE_MINUS_ONE, Constants.INFINITY_STAR);

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java
deleted file mode 100644
index d290392ca18..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.tester;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

-import org.eclipse.papyrus.uml.nattable.Activator;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class IsUMLElementTester implements ITableTester {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.tester.ITableTester#isAllowed(java.lang.Object)

-	 * 

-	 * @param context

-	 * @return

-	 */

-	public IStatus isAllowed(Object context) {

-		if(context instanceof Element) {

-			return new Status(IStatus.OK, Activator.PLUGIN_ID, "The context is a UML Element");

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The context is not an UML Element");

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java
deleted file mode 100644
index 0efdd94d4a8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.utils;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class Constants {

-

-	private Constants() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * the id used for stereotypes properties

-	 */

-	public static final String PROPERTY_OF_STEREOTYPE_PREFIX = "property_of_stereotype:/"; //$NON-NLS-1$

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
deleted file mode 100644
index 688adbb0442..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.utils;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * 

- * This class provides useful methods to manage stereotypes in the table

- * 

- */

-public class UMLTableUtils {

-

-	public static final String PROPERTY_OF_STEREOTYPE_PREFIX = "property_of_stereotype:/"; //$NON-NLS-1$

-

-	private UMLTableUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param eobject

-	 *        an element of the model (currently, if it is not an UML::Element, we can't find the property)

-	 * @param id

-	 *        the id used to identify the property of the stereotype

-	 * @return

-	 *         the UML::Property or <code>null</code> if we can't resolve it (the required profile is not applied)

-	 */

-	public static Property getRealStereotypeProperty(final EObject eobject, final String id) {

-		assert id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX);

-		if(eobject instanceof Element) {

-			final Element element = (Element)eobject;

-			final String propertyQN = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$

-			final String propertyName = NamedElementUtil.getNameFromQualifiedName(propertyQN);

-			final String stereotypeQN = NamedElementUtil.getParentQualifiedName(propertyQN);

-			final String stereotypeName = NamedElementUtil.getNameFromQualifiedName(stereotypeQN);

-			final String profileQN = NamedElementUtil.getParentQualifiedName(stereotypeQN);

-			final Profile profile = element.getNearestPackage().getAppliedProfile(profileQN, true);

-			if(profile != null) {

-				final Stereotype ste = profile.getOwnedStereotype(stereotypeName);

-				return (Property)ste.getMember(propertyName);

-			}

-

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param element

-	 *        the UML::Element on which we are looking for applied Stereotype with the property identified by its id

-	 * @param id

-	 *        the id used to identify the property of the stereotype

-	 * @return

-	 *         the list of UML::Stereotype which have the property identified by this id and which are applied on the Element or <code>null</code> if

-	 *         we can't resolve it (the required profile is not applied)

-	 */

-	public static final List<Stereotype> getAppliedSteretoypesWithThisProperty(final Element element, final String id) {

-		assert id.startsWith(PROPERTY_OF_STEREOTYPE_PREFIX);

-		final List<Stereotype> stereotypes = new ArrayList<Stereotype>();

-		final Object prop = getRealStereotypeProperty(element, id);

-		if(prop instanceof Property) {

-			for(final Stereotype current : element.getAppliedStereotypes()) {

-				if(current.getAllAttributes().contains(prop)) {

-					stereotypes.add(current);

-				}

-			}

-		}

-		return stereotypes;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/RealDataValidator.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/RealDataValidator.java
deleted file mode 100644
index 05643bc4a48..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/RealDataValidator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.validator;

-

-import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;

-import org.eclipse.papyrus.infra.widgets.validator.RealInputValidator;

-

-/**

- * 

- * Validator for Real values

- * 

- */

-public class RealDataValidator 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) {

-		final RealInputValidator validator = new RealInputValidator();

-		return validator.isValid(newValue.toString()) == null;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/UnlimitedNaturalDataValidator.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/UnlimitedNaturalDataValidator.java
deleted file mode 100644
index 776dd563d01..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/UnlimitedNaturalDataValidator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.validator;

-

-import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;

-import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalInputValidator;

-

-/**

- * 

- * @author Vincent Lorenzo

- *         Validator for UnlimitedNatural

- */

-public class UnlimitedNaturalDataValidator 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) {

-		final UnlimitedNaturalInputValidator validator = new UnlimitedNaturalInputValidator();

-		return validator.isValid(newValue.toString()) == null;

-	}

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java
deleted file mode 100644
index 376fde6881d..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * 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.uml.nattable.widget;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.window.Window;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-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.celleditor.AbstractComboAction;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;

-import org.eclipse.papyrus.uml.nattable.Activator;

-import org.eclipse.papyrus.uml.nattable.dataprovider.UMLSingleReferenceComboBoxDataProvider;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.papyrus.uml.tools.providers.UMLContentProvider;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- *         FIXME : maybe we could improve this action using AbstractDialogCellEditor

- */

-public class UMLDialogComboAction extends AbstractComboAction {

-

-	/**

-	 * the edited element

-	 */

-	private Object axisElement;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param axisElement

-	 *        the axis element

-	 * @param dataProvider

-	 *        the combo box data provider. it must be a UMLSingleReferenceComboBoxDataProvider

-	 */

-	public UMLDialogComboAction(final Object axisElement, IComboBoxDataProvider dataProvider) {

-		super(dataProvider);

-		assert dataProvider instanceof UMLSingleReferenceComboBoxDataProvider;

-		this.axisElement = axisElement;

-	}

-

-	@Override

-	public void run() {

-		if(this.dataProvider instanceof UMLSingleReferenceComboBoxDataProvider) {

-			final TreeSelectorDialog dialog = new TreeSelectorDialog(Display.getDefault().getActiveShell());

-			final Object rowElement = ((UMLSingleReferenceComboBoxDataProvider)this.dataProvider).getEditedEObject(this.columnIndex, this.rowIndex);

-			final Object columnElement = ((UMLSingleReferenceComboBoxDataProvider)this.dataProvider).getEditedFeature(this.columnIndex, this.rowIndex);

-

-			EObject realEditedObject = null;

-			EStructuralFeature realFeature = null;

-

-			Element editedElement = null;

-			Object feature = this.axisElement;

-			if(rowElement instanceof Element && columnElement == this.axisElement) {

-				editedElement = (Element)rowElement;

-			} else if(rowElement == this.axisElement && columnElement instanceof EObject) {

-				editedElement = (Element)columnElement;

-			}

-

-

-			Stereotype stereotype = null;

-			List<Stereotype> stereotypesWithEditedFeatureAppliedOnElement = null;

-			if(feature instanceof EStructuralFeature) {

-				realFeature = (EStructuralFeature)feature;

-				realEditedObject = editedElement;

-			} else {

-				String id = AxisUtils.getPropertyId(feature);

-				stereotypesWithEditedFeatureAppliedOnElement = UMLTableUtils.getAppliedSteretoypesWithThisProperty(editedElement, id);

-				stereotype = stereotypesWithEditedFeatureAppliedOnElement.get(0);

-				realEditedObject = editedElement.getStereotypeApplication(stereotypesWithEditedFeatureAppliedOnElement.get(0));

-				Property prop = UMLTableUtils.getRealStereotypeProperty(editedElement, id);

-				realFeature = realEditedObject.eClass().getEStructuralFeature(prop.getName());

-			}

-

-			if(stereotypesWithEditedFeatureAppliedOnElement != null && stereotypesWithEditedFeatureAppliedOnElement.size() > 1) {

-				//FIXME : not yet managed

-				return;

-			}

-			dialog.setTitle(realFeature.getEType().getName());

-

-			dialog.setLabelProvider(getLabelProvider(editedElement));

-			int currentIndex = this.combo.getSelectionIndex();

-			List<?> values = this.dataProvider.getValues(this.columnIndex, this.rowIndex);

-			Object initialSelection = null;

-			if(currentIndex != -1) {

-				initialSelection = values.get(currentIndex);

-			}

-			final ITreeContentProvider provider = new UMLContentProvider(realEditedObject, realFeature, stereotype, editedElement.eResource().getResourceSet());

-			dialog.setContentProvider(provider);

-			if(initialSelection != null) {

-				dialog.setInitialElementSelections(Collections.singletonList(initialSelection));

-			}

-			int res = dialog.open();

-			if(res == Window.OK) {

-				final Object[] result = dialog.getResult();

-				int index = values.indexOf(result[0]);

-				this.combo.select(index);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param context

-	 *        the context used to find the label provider

-	 * @return

-	 *         the label provider

-	 */

-	protected ILabelProvider getLabelProvider(final EObject context) {

-		ILabelProvider labelProvider = null;

-		try {

-			ServicesRegistry registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(context);

-			LabelProviderService labelproviderService = registry.getService(LabelProviderService.class);

-			labelProvider = labelproviderService.getLabelProvider(context);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return labelProvider;

-	}

-}